From 3a09cadd80db5f72785547ab39138f347766e1ed Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Thu, 10 Sep 2020 14:02:09 -0700 Subject: [PATCH 1/5] Fix label for github label tool and framework (#37) --- .ghal.rules.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ghal.rules.json b/.ghal.rules.json index eb81642863..272758d151 100644 --- a/.ghal.rules.json +++ b/.ghal.rules.json @@ -18,10 +18,10 @@ }, "contentsource": { "(?i).*dotnet-desktop-guide\/framework\/wpf.*": { - "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WPF" + "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WPF" }, "(?i).*dotnet-desktop-guide\/framework\/winforms.*": { - "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WinForms" + "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WinForms" }, "(?i).*dotnet-desktop-guide\/net\/wpf.*": { "labels-add": ":books: Area - .NET,:card_file_box: Technology - WPF" @@ -50,10 +50,10 @@ "processor-files": { "changedfile": { "(?i).*dotnet-desktop-guide\/framework\/wpf.*": { - "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WPF" + "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WPF" }, "(?i).*dotnet-desktop-guide\/framework\/winforms.*": { - "labels-add": ":books: Area - .Framework,:card_file_box: Technology - WinForms" + "labels-add": ":books: Area - .NET Framework,:card_file_box: Technology - WinForms" }, "(?i).*dotnet-desktop-guide\/net\/wpf.*": { "labels-add": ":books: Area - .NET,:card_file_box: Technology - WPF" From e2f1d47e0b7f1039de43e89bc5886b0735bc38aa Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Thu, 10 Sep 2020 14:40:52 -0700 Subject: [PATCH 2/5] Update build-validation.yml (#36) --- .github/workflows/build-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 08f107713e..f3a4f93727 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -21,7 +21,7 @@ on: branches: [ master ] env: - DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx-preview7' + DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx-preview8' DOTNET_DO_INSTALL: 'true' EnableNuGetPackageRestore: 'True' From ae45d8f130c52c0b0c307c996bfc697785527dee Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Fri, 11 Sep 2020 10:14:52 -0700 Subject: [PATCH 3/5] Update docfx.json metadata (#38) * Update docfx.json Add missing metadata * Update docfx.json Add ms.prod * Update docfx.json * Update docfx.json * Add prod to index.md --- dotnet-desktop-guide/docfx.json | 14 +++++++++++++- dotnet-desktop-guide/index.md | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dotnet-desktop-guide/docfx.json b/dotnet-desktop-guide/docfx.json index 14d3c3a668..e801a39eb7 100644 --- a/dotnet-desktop-guide/docfx.json +++ b/dotnet-desktop-guide/docfx.json @@ -140,6 +140,18 @@ "net/winforms/**/**.md": "Windows Forms .NET", "framework/wpf/**/**.md": "WPF .NET Framework", "net/wpf/**/**.md": "WPF .NET" + }, + "ms.technology": { + "framework/winforms/**/**.md": "dotnet-winforms", + "framework/wpf/**/**.md": "dotnet-wpf", + "net/winforms/**/**.md": "dotnet-winforms", + "net/wpf/**/**.md": "dotnet-wpf" + }, + "ms.prod": { + "framework/winforms/**/**.md": "dotnet-framework", + "framework/wpf/**/**.md": "dotnet-framework", + "net/winforms/**/**.md": "dotnet-desktop", + "net/wpf/**/**.md": "dotnet-desktop" } }, "template": [], @@ -156,4 +168,4 @@ } } } -} \ No newline at end of file +} diff --git a/dotnet-desktop-guide/index.md b/dotnet-desktop-guide/index.md index 253afd8b8b..b1179a029f 100644 --- a/dotnet-desktop-guide/index.md +++ b/dotnet-desktop-guide/index.md @@ -1,6 +1,7 @@ --- title: Desktop Guide for WPF and Windows Forms description: Introduction to the Desktop Guide for WPF and Windows Forms for both .NET 5 and .NET Framework. +ms.prod: dotnet-desktop ms.date: "08/30/2020" --- From 611817b5e44a9fd23e8744afec363f2eeb5d48ef Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 15 Sep 2020 11:15:26 -0700 Subject: [PATCH 4/5] Snippets config: Remove CPP triggers; Update to .NET 5 RC 1 (#44) * Update build-validation.yml * Update build-validation.yml * Update build-validation.yml --- .github/workflows/build-validation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index f3a4f93727..be8708a02a 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -9,19 +9,19 @@ on: - "**.cs" - "**.vb" - "**.fs" - - "**.cpp" - - "**.h" - "**.xaml" - "**.razor" - "**.cshtml" - "**.vbhtml" - - "**.*proj" + - "**.csproj" + - "**.vbproj" + - "**.fsproj" - "**global.json" - "**snippets.5000.json" branches: [ master ] env: - DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx-preview8' + DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx' DOTNET_DO_INSTALL: 'true' EnableNuGetPackageRestore: 'True' From 57747b5d52055c8f5b03629a73cb352b934afd96 Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Tue, 15 Sep 2020 18:13:14 -0700 Subject: [PATCH 5/5] Change bread to have ?view= to clear (#26) * Change bread to have ?view= to clear * Change bread link * fix view links * fix view links * fix view links * update bread/toc * update bread/toc * fix breadcrumb toc * Update index.md * Update TOC.yml Co-authored-by: mingwli --- dotnet-desktop-guide/TOC.yml | 7 ++++--- dotnet-desktop-guide/framework/breadcrumb/toc.yml | 12 ++++++------ dotnet-desktop-guide/index.md | 8 ++++---- dotnet-desktop-guide/net/breadcrumb/toc.yml | 14 +++++++------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dotnet-desktop-guide/TOC.yml b/dotnet-desktop-guide/TOC.yml index 6f768a1bf6..18bad91192 100644 --- a/dotnet-desktop-guide/TOC.yml +++ b/dotnet-desktop-guide/TOC.yml @@ -3,11 +3,12 @@ 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: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true - name: .NET Framework - href: https://docs.microsoft.com/dotnet/desktop/winforms/?view=netframeworkdesktop-4.8 + href: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true - name: Windows Presentation Foundation expanded: true items: - name: .NET Framework - href: https://docs.microsoft.com/dotnet/desktop/wpf/?view=netframeworkdesktop-4.8 \ No newline at end of file + href: framework/wpf/index.md?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 5673b945fa..46329baeca 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: / + tocHref: /?view=&preserve-view=true + topicHref: /?view=&preserve-view=true items: - name: .NET - tocHref: /dotnet/ - topicHref: /dotnet/index + tocHref: /dotnet/?view=&preserve-view=true + topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide - tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index + tocHref: /dotnet/desktop?view=&preserve-view=true + topicHref: /dotnet/desktop/index?view=&preserve-view=true items: - name: .NET Framework items: diff --git a/dotnet-desktop-guide/index.md b/dotnet-desktop-guide/index.md index b1179a029f..1738c3e75c 100644 --- a/dotnet-desktop-guide/index.md +++ b/dotnet-desktop-guide/index.md @@ -15,11 +15,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). @@ -33,11 +33,11 @@ There are two implementations of WPF, each with it's own documentation: 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 WinForms is distributed with .NET Framework. - The documentation for this version of WinForms is available [here](framework/winforms/index.yml?view=netframeworkdesktop-4.8). + The documentation for this version of WinForms 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). diff --git a/dotnet-desktop-guide/net/breadcrumb/toc.yml b/dotnet-desktop-guide/net/breadcrumb/toc.yml index 13f16dae18..ce5dc076d8 100644 --- a/dotnet-desktop-guide/net/breadcrumb/toc.yml +++ b/dotnet-desktop-guide/net/breadcrumb/toc.yml @@ -1,18 +1,18 @@ items: - name: Docs - tocHref: / - topicHref: / + tocHref: /?view=&preserve-view=true + topicHref: /?view=&preserve-view=true items: - name: .NET - tocHref: /dotnet/ - topicHref: /dotnet/index + tocHref: /dotnet/?view=&preserve-view=true + topicHref: /dotnet/index?view=&preserve-view=true items: - name: Desktop Guide - tocHref: /dotnet/desktop - topicHref: /dotnet/desktop/index + tocHref: /dotnet/desktop?view=&preserve-view=true + topicHref: /dotnet/desktop/index?view=&preserve-view=true 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