From fc2d8a8b0424f74b87da3e2d688fd129e98678b1 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 2 Sep 2020 10:18:44 -0700 Subject: [PATCH 01/10] Change bread to have ?view= to clear --- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 6 +++--- dotnet-desktop-guide/net/breadcrumb/toc.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dotnet-desktop-guide/framework/breadcrumb/toc.yml b/dotnet-desktop-guide/framework/breadcrumb/toc.yml index 1dac05392a..ba966f46f1 100644 --- a/dotnet-desktop-guide/framework/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/framework/breadcrumb/toc.yml @@ -1,15 +1,15 @@ items: - name: Docs tocHref: / - topicHref: / + topicHref: /?view= items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index + topicHref: /dotnet/index?view= items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index + topicHref: /dotnet/desktop/index?view= items: - name: .NET Framework items: diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index 13f16dae18..acdb32676b 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -1,15 +1,15 @@ items: - name: Docs tocHref: / - topicHref: / + topicHref: /?view= items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index + topicHref: /dotnet/index?view= items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index + topicHref: /dotnet/desktop/index?view= items: - name: ".NET 5 (and .NET Core 3.1)" items: From a229df0cc03e5638a9c7f6d6c2ec63e2289fdf28 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 2 Sep 2020 10:24:55 -0700 Subject: [PATCH 02/10] Change bread link --- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 6 +++--- dotnet-desktop-guide/net/breadcrumb/toc.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dotnet-desktop-guide/framework/breadcrumb/toc.yml b/dotnet-desktop-guide/framework/breadcrumb/toc.yml index ba966f46f1..4dbb2280a6 100644 --- a/dotnet-desktop-guide/framework/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/framework/breadcrumb/toc.yml @@ -1,15 +1,15 @@ items: - name: Docs tocHref: / - topicHref: /?view= + topicHref: /?view items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index?view= + topicHref: /dotnet/index?view items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index?view= + topicHref: /dotnet/desktop/index?view items: - name: .NET Framework items: diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index acdb32676b..dd2b4fd8cc 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -1,15 +1,15 @@ items: - name: Docs tocHref: / - topicHref: /?view= + topicHref: /?view items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index?view= + topicHref: /dotnet/index?view items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index?view= + topicHref: /dotnet/desktop/index?view items: - name: ".NET 5 (and .NET Core 3.1)" items: From 54deda1aa299ad3442a43da460f615d381d3b0dd Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Thu, 3 Sep 2020 07:26:11 -0700 Subject: [PATCH 03/10] fix view links --- dotnet-desktop-guide/TOC.yml | 4 ++-- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index be5180e4b2..953fec6867 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -3,6 +3,6 @@ items: expanded: true items: - name: ".NET 5 (and .NET Core 3.1)" - href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netdesktop-5.0 + href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netdesktop-5.0&preserve-view=true - name: .NET Framework - href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netframeworkdesktop-4-8 + href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netframeworkdesktop-4-8&preserve-view=true diff --git a/dotnet-desktop-guide/framework/breadcrumb/toc.yml b/dotnet-desktop-guide/framework/breadcrumb/toc.yml index 4dbb2280a6..3edcf43e91 100644 --- a/dotnet-desktop-guide/framework/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/framework/breadcrumb/toc.yml @@ -5,11 +5,11 @@ items: items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index?view + topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index?view + topicHref: /dotnet/desktop/index?view=&preserve-view=true items: - name: .NET Framework items: From 4b08dd73bf14c6dc55a2e3d70a3e70d203c1c0de Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Thu, 3 Sep 2020 07:50:25 -0700 Subject: [PATCH 04/10] fix view links --- dotnet-desktop-guide/TOC.yml | 4 ++-- dotnet-desktop-guide/index.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index dc993db15f..88f96d4fc2 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -3,6 +3,6 @@ items: expanded: true items: - name: ".NET 5 (and .NET Core 3.1)" - href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netdesktop-5.0&preserve-view=true + href: net/winforms/?view=netdesktop-5.0&preserve-view=true - name: .NET Framework - href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netframeworkdesktop-4.8&preserve-view=true + href: framework/winforms/?view=netframeworkdesktop-4.8&preserve-view=true diff --git a/dotnet-desktop-guide/index.md b/dotnet-desktop-guide/index.md index ca03792be1..4907988d83 100644 --- a/dotnet-desktop-guide/index.md +++ b/dotnet-desktop-guide/index.md @@ -14,11 +14,11 @@ Historically, the .NET Framework-based documentation for WPF and WinForms has be There are two implementations of Windows Forms, each with it's own documentation: -01. The [.NET Framework 4 implementation](framework/winforms/index.yml?view=netframeworkdesktop-4.8) that's supported by Visual Studio 2019 and Visual Studio 2017. +01. The [.NET Framework 4 implementation](framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true) that's supported by Visual Studio 2019 and Visual Studio 2017. .NET Framework 4 is a Windows-only version of .NET and is considered a Windows Operating System component. This version of Windows Forms is distributed with .NET Framework. - The documentation for this version of Windows Forms is available [here](framework/winforms/index.yml?view=netframeworkdesktop-4.8). + The documentation for this version of Windows Forms is available [here](framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true). 01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/winforms). From e78255ec1a4f05180ec44895fc9293ba9ecb0f4c Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Thu, 3 Sep 2020 08:01:08 -0700 Subject: [PATCH 05/10] fix view links --- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 2 +- dotnet-desktop-guide/net/breadcrumb/toc.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet-desktop-guide/framework/breadcrumb/toc.yml b/dotnet-desktop-guide/framework/breadcrumb/toc.yml index 3edcf43e91..4c140ec04c 100644 --- a/dotnet-desktop-guide/framework/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/framework/breadcrumb/toc.yml @@ -1,7 +1,7 @@ items: - name: Docs tocHref: / - topicHref: /?view + topicHref: /?view=&preserve-view=true items: - name: .NET tocHref: /dotnet/ diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index dd2b4fd8cc..7bc981928c 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -1,15 +1,15 @@ items: - name: Docs tocHref: / - topicHref: /?view + topicHref: /?view=&preserve-view=true items: - name: .NET tocHref: /dotnet/ - topicHref: /dotnet/index?view + topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index?view + topicHref: /dotnet/desktop/index?view=&preserve-view=true items: - name: ".NET 5 (and .NET Core 3.1)" items: From 9032bc93abdbafcc9e1e4d0f702f5cc7575cd4f9 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Tue, 8 Sep 2020 12:01:05 -0700 Subject: [PATCH 06/10] update bread/toc --- dotnet-desktop-guide/TOC.yml | 4 ++-- dotnet-desktop-guide/net/breadcrumb/toc.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index 88f96d4fc2..984ffd936d 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -3,6 +3,6 @@ items: expanded: true items: - name: ".NET 5 (and .NET Core 3.1)" - href: net/winforms/?view=netdesktop-5.0&preserve-view=true + href: net/winforms/index?view=netdesktop-5.0&preserve-view=true - name: .NET Framework - href: framework/winforms/?view=netframeworkdesktop-4.8&preserve-view=true + href: framework/winforms/index?view=netframeworkdesktop-4.8&preserve-view=true diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index 7bc981928c..2efddaa860 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -1,14 +1,14 @@ items: - name: Docs - tocHref: / + tocHref: /?view=&preserve-view=true topicHref: /?view=&preserve-view=true items: - name: .NET - tocHref: /dotnet/ + tocHref: /dotnet/?view=&preserve-view=true topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide - tocHref: /dotnet/desktop + tocHref: /dotnet/desktop?view=&preserve-view=true topicHref: /dotnet/desktop/index?view=&preserve-view=true items: - name: ".NET 5 (and .NET Core 3.1)" From 3ffe25d0e45149929af240f39eb79c4a791ce75c Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Tue, 8 Sep 2020 12:26:15 -0700 Subject: [PATCH 07/10] update bread/toc --- dotnet-desktop-guide/TOC.yml | 4 ++-- dotnet-desktop-guide/net/breadcrumb/toc.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index 984ffd936d..3f905b6e96 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -3,6 +3,6 @@ items: expanded: true items: - name: ".NET 5 (and .NET Core 3.1)" - href: net/winforms/index?view=netdesktop-5.0&preserve-view=true + href: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true - name: .NET Framework - href: framework/winforms/index?view=netframeworkdesktop-4.8&preserve-view=true + href: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index 2efddaa860..ce5dc076d8 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -14,5 +14,5 @@ items: - name: ".NET 5 (and .NET Core 3.1)" items: - name: Windows Forms - tocHref: /dotnet/desktop/winforms + tocHref: /dotnet/desktop/winforms/ topicHref: /dotnet/desktop/winforms/index From 3afb529bcd45f3ba64fa6096e728f8ce0fe1cc5c Mon Sep 17 00:00:00 2001 From: mingwli Date: Wed, 9 Sep 2020 10:16:42 +0800 Subject: [PATCH 08/10] fix breadcrumb toc --- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dotnet-desktop-guide/framework/breadcrumb/toc.yml b/dotnet-desktop-guide/framework/breadcrumb/toc.yml index 8eaeed65d6..46329baeca 100644 --- a/dotnet-desktop-guide/framework/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/framework/breadcrumb/toc.yml @@ -1,14 +1,14 @@ items: - name: Docs - tocHref: / + tocHref: /?view=&preserve-view=true topicHref: /?view=&preserve-view=true items: - name: .NET - tocHref: /dotnet/ + tocHref: /dotnet/?view=&preserve-view=true topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide - tocHref: /dotnet/desktop + tocHref: /dotnet/desktop?view=&preserve-view=true topicHref: /dotnet/desktop/index?view=&preserve-view=true items: - name: .NET Framework From 68d9fe32aebcac83d0aea9fdd71e0f422d1f9575 Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 15 Sep 2020 18:02:06 -0700 Subject: [PATCH 09/10] Update index.md --- dotnet-desktop-guide/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet-desktop-guide/index.md b/dotnet-desktop-guide/index.md index e13cbb3c25..114d9ac09a 100644 --- a/dotnet-desktop-guide/index.md +++ b/dotnet-desktop-guide/index.md @@ -14,11 +14,11 @@ Historically, the .NET Framework-based documentation for WPF and WinForms has be There are two implementations of WPF, each with it's own documentation: -01. The [.NET Framework 4 implementation](framework/wpf/index.md?view=netframeworkdesktop-4.8) that's supported by Visual Studio 2019 and Visual Studio 2017. +01. The [.NET Framework 4 implementation](framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true) that's supported by Visual Studio 2019 and Visual Studio 2017. .NET Framework 4 is a Windows-only version of .NET and is considered a Windows Operating System component. This version of Windows Presentation Foundation is distributed with .NET Framework. - The documentation for this version of WPF is available [here](framework/wpf/index.md?view=netframeworkdesktop-4.8). + The documentation for this version of WPF is available [here](framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true). 01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/wpf). From 48c50b36d4517eb3e4d05c1e00f6e433b233d303 Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 15 Sep 2020 18:03:59 -0700 Subject: [PATCH 10/10] Update TOC.yml --- dotnet-desktop-guide/TOC.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index 1a61ff51c3..18bad91192 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -10,4 +10,5 @@ items: expanded: true items: - name: .NET Framework - href: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true \ No newline at end of file + href: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true +