From 7c3072edcfc59dc01e8db602deee9aca8ba92e06 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 21 Oct 2020 11:24:20 -0700 Subject: [PATCH 1/5] Convert index to landing --- dotnet-desktop-guide/index.md | 48 ---------------------------------- dotnet-desktop-guide/index.yml | 47 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 dotnet-desktop-guide/index.md create mode 100644 dotnet-desktop-guide/index.yml diff --git a/dotnet-desktop-guide/index.md b/dotnet-desktop-guide/index.md deleted file mode 100644 index 9063c8e7ab..0000000000 --- a/dotnet-desktop-guide/index.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -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" ---- - -# Desktop Guide for .NET, .NET Core, and .NET Framework - -Welcome to the Desktop Guide. The Desktop Guide is a set of documentation for .NET-based Windows UI technologies including Windows Presentation Foundation (WPF) and Windows Forms (WinForms). The Desktop Guide will cover both .NET 5 (and .NET Core 3.1) and later versions, along with .NET Framework. - -Historically, the .NET Framework-based documentation for WPF and WinForms has been included in the [.NET Documentation](/dotnet). Windows Forms content has been migrated to this guide, while the migration of WPF content is ongoing. - -## Windows Presentation Foundation - -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&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&preserve-view=true). - -01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/wpf). - - This version runs on **.NET 5 and .NET Core 3.1**. The WPF XAML Visual Designer requires, at a minimum, [Visual Studio 2019 version 16.X](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019+desktopguide+winforms). - - Even though this version of .NET is cross-platform, WPF remains a Windows-only technology. - - The documentation for this version of WPF is in progress and is available [here](net/wpf/index.yml?view=netdesktop-5.0&preserve-view=true). - -## Windows Forms - -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&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&preserve-view=true). - -01. The open-source implementation hosted on [GitHub](https://github.com/dotnet/winforms). - - This version runs on **.NET 5 and .NET Core 3.1**. The Windows Forms Visual Designer requires, at a minimum, [Visual Studio 2019 version 16.X](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019+desktopguide+winforms). - - Even though this version of .NET is cross-platform, WinForms remains a Windows-only technology. - - The documentation for this version of WinForms is in progress and not yet available. diff --git a/dotnet-desktop-guide/index.yml b/dotnet-desktop-guide/index.yml new file mode 100644 index 0000000000..a4c821b359 --- /dev/null +++ b/dotnet-desktop-guide/index.yml @@ -0,0 +1,47 @@ +### YamlMime:Landing + +title: Desktop Guide for .NET, .NET Core, and .NET Framework +summary: "Welcome to the Desktop Guide. The Desktop Guide is a set of documentation for .NET-based Windows UI technologies including Windows Presentation Foundation (WPF) and Windows Forms (WinForms). The Desktop Guide will cover both .NET 5 (and .NET Core 3.1) and later versions, along with .NET Framework." + +metadata: + title: Desktop Guide for WPF and Windows Forms on .NET + description: Introduction to the Desktop Guide for WPF and Windows Forms for both .NET 5 and .NET Framework. + ms.topic: landing-page + ms.date: 10/21/2020 + +# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new + +landingContent: + +- title: .NET 5 (and .NET Core 3.1) + linkLists: + - linkListType: overview + links: + - text: Windows Presentation Foundation (WPF) + url: net/wpf/index.yml?view=netdesktop-5.0&preserve-view=true + - text: Windows Forms (WinForms) + url: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true + +- title: .NET Framework + linkLists: + - linkListType: overview + links: + - text: Windows Presentation Foundation (WPF) + url: framework/wpf/index.yml?view=netframeworkdesktop-4.8&preserve-view=true + - text: Windows Forms (WinForms) + url: framework/winforms/index.md?view=netframeworkdesktop-4.8&preserve-view=true + - linkListType: overview + links: + - text: Windows Presentation Foundation (WPF) + url: framework/wpf/introduction-to-wpf.md?view=netframeworkdesktop-4.8&preserve-view=true + - text: Windows Forms (WinForms) + url: framework/winforms/windows-forms-overview.md?view=netframeworkdesktop-4.8&preserve-view=true + +- title: Other desktop technologies + linkLists: + - linkListType: overview + links: + - text: Universal Windows Apps + url: /uwp + - text: Xamarin Forms + url: /xamarin/xamarin-forms/ From 4460edb10ed13ee6076646b29f21ba0ea03dfbe9 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 21 Oct 2020 12:01:49 -0700 Subject: [PATCH 2/5] Adjust links --- dotnet-desktop-guide/index.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dotnet-desktop-guide/index.yml b/dotnet-desktop-guide/index.yml index a4c821b359..953945f1a4 100644 --- a/dotnet-desktop-guide/index.yml +++ b/dotnet-desktop-guide/index.yml @@ -27,14 +27,14 @@ landingContent: - linkListType: overview links: - text: Windows Presentation Foundation (WPF) - url: framework/wpf/index.yml?view=netframeworkdesktop-4.8&preserve-view=true + url: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true - text: Windows Forms (WinForms) - url: framework/winforms/index.md?view=netframeworkdesktop-4.8&preserve-view=true - - linkListType: overview + url: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true + - linkListType: concept links: - - text: Windows Presentation Foundation (WPF) + - text: Introduction to WPF url: framework/wpf/introduction-to-wpf.md?view=netframeworkdesktop-4.8&preserve-view=true - - text: Windows Forms (WinForms) + - text: Introduction to WinForms url: framework/winforms/windows-forms-overview.md?view=netframeworkdesktop-4.8&preserve-view=true - title: Other desktop technologies From e3db98a60c63042c97d95f5d54933f0df55b02c6 Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 21 Oct 2020 12:20:36 -0700 Subject: [PATCH 3/5] Minor updates; try hub style --- dotnet-desktop-guide/hub.yml | 68 ++++++++++++++++++++++++++++++++++ dotnet-desktop-guide/index.yml | 3 ++ 2 files changed, 71 insertions(+) create mode 100644 dotnet-desktop-guide/hub.yml diff --git a/dotnet-desktop-guide/hub.yml b/dotnet-desktop-guide/hub.yml new file mode 100644 index 0000000000..3d8fc99faf --- /dev/null +++ b/dotnet-desktop-guide/hub.yml @@ -0,0 +1,68 @@ +### YamlMime:Hub + +title: Desktop Guide for .NET, .NET Core, and .NET Framework +summary: "Learn to create desktop apps for Windows using Windows Presentation Foundation (WPF) and Windows Forms (WinForms)." +brand: dotnet + +metadata: + title: Desktop Guide for .NET, .NET Core, and .NET Framework + description: "Learn to create desktop apps for Windows using Windows Presentation Foundation (WPF) and Windows Forms (WinForms)." + ms.product: dotnet-desktop + ms.topic: hub-page # Required + ms.collection: collection # Optional; Remove if no collection is used. + author: adegeo + ms.author: adegeo + ms.date: 10/21/2020 + +# highlightedContent section (optional) +# Maximum of 8 items +highlightedContent: +# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new + items: + # Card + - title: "Download .NET" + itemType: download + url: https://dotnet.microsoft.com/download + # Card + - title: "Create your first WPF app" + itemType: get-started + url: /visualstudio/get-started/csharp/tutorial-wpf?view=vs-2019 + # Card + - title: "Create your first WinForms app" + itemType: get-started + url: /visualstudio/get-started/csharp/tutorial-winforms?view=vs-2019 + +# additionalContent section (optional) +# Card with links style +additionalContent: + # Supports up to 3 sections + sections: + - title: Desktop guide for .NET # < 60 chars (optional) + summary: Windows Presentation Foundation and Windows Forms for .NET 5 (and .NET Core 3.1). # < 160 chars (optional) + items: + # Card + - title: Windows Presentation Foundation + links: + - text: Landing page + url: net/wpf/index.yml?view=netdesktop-5.0&preserve-view=true + # Card + - title: Windows Forms + links: + - text: Landing page + url: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true + + - title: Desktop guide for .NET Framework # < 60 chars (optional) + summary: Windows Presentation Foundation and Windows Forms for .NET Framework. # < 160 chars (optional) + items: + # Card + - title: Windows Presentation Foundation + links: + - text: Landing page + url: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true + # Card + - title: Windows Forms + links: + - text: Landing page + url: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true + # footer (optional) + footer: "Contribute to .NET docs. Read our [contributor guide](/contribute/dotnet/dotnet-contribute)." \ No newline at end of file diff --git a/dotnet-desktop-guide/index.yml b/dotnet-desktop-guide/index.yml index 953945f1a4..2c28da077f 100644 --- a/dotnet-desktop-guide/index.yml +++ b/dotnet-desktop-guide/index.yml @@ -7,6 +7,9 @@ metadata: title: Desktop Guide for WPF and Windows Forms on .NET description: Introduction to the Desktop Guide for WPF and Windows Forms for both .NET 5 and .NET Framework. ms.topic: landing-page + ms.product: dotnet + author: adegeo + ms.author: adegeo ms.date: 10/21/2020 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new From 16418e87cebc978f868f1d255c3dec346af5bf6a Mon Sep 17 00:00:00 2001 From: "Andy De George (adegeo)" Date: Wed, 21 Oct 2020 12:39:18 -0700 Subject: [PATCH 4/5] Update hub info --- dotnet-desktop-guide/hub.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dotnet-desktop-guide/hub.yml b/dotnet-desktop-guide/hub.yml index 3d8fc99faf..c835eb1155 100644 --- a/dotnet-desktop-guide/hub.yml +++ b/dotnet-desktop-guide/hub.yml @@ -20,9 +20,9 @@ highlightedContent: # itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new items: # Card - - title: "Download .NET" + - title: "Install Visual Studio 2019" itemType: download - url: https://dotnet.microsoft.com/download + url: /visualstudio/install/install-visual-studio?view=vs-2019 # Card - title: "Create your first WPF app" itemType: get-started @@ -37,8 +37,7 @@ highlightedContent: additionalContent: # Supports up to 3 sections sections: - - title: Desktop guide for .NET # < 60 chars (optional) - summary: Windows Presentation Foundation and Windows Forms for .NET 5 (and .NET Core 3.1). # < 160 chars (optional) + - title: .NET items: # Card - title: Windows Presentation Foundation @@ -51,8 +50,7 @@ additionalContent: - text: Landing page url: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true - - title: Desktop guide for .NET Framework # < 60 chars (optional) - summary: Windows Presentation Foundation and Windows Forms for .NET Framework. # < 160 chars (optional) + - title: .NET Framework # < 60 chars (optional) items: # Card - title: Windows Presentation Foundation @@ -64,5 +62,15 @@ additionalContent: links: - text: Landing page url: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true + + - title: Other desktop technologies # < 60 chars (optional) + items: + - title: Universal Windows Apps + summary: Universal Windows apps for all devices that run Windows 10 + url: /uwp + - title: Xamarin.Forms + summary: Xamarin.Forms lets you build native apps using a .NET cross-platform UI + url: /xamarin/xamarin-forms/ + # footer (optional) footer: "Contribute to .NET docs. Read our [contributor guide](/contribute/dotnet/dotnet-contribute)." \ No newline at end of file From 0e0f75118a13b5ec5e4949070691742bd864787a Mon Sep 17 00:00:00 2001 From: Andy De George <67293991+adegeo@users.noreply.github.com> Date: Mon, 26 Oct 2020 12:32:22 -0700 Subject: [PATCH 5/5] Delete hub.yml --- dotnet-desktop-guide/hub.yml | 76 ------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 dotnet-desktop-guide/hub.yml diff --git a/dotnet-desktop-guide/hub.yml b/dotnet-desktop-guide/hub.yml deleted file mode 100644 index c835eb1155..0000000000 --- a/dotnet-desktop-guide/hub.yml +++ /dev/null @@ -1,76 +0,0 @@ -### YamlMime:Hub - -title: Desktop Guide for .NET, .NET Core, and .NET Framework -summary: "Learn to create desktop apps for Windows using Windows Presentation Foundation (WPF) and Windows Forms (WinForms)." -brand: dotnet - -metadata: - title: Desktop Guide for .NET, .NET Core, and .NET Framework - description: "Learn to create desktop apps for Windows using Windows Presentation Foundation (WPF) and Windows Forms (WinForms)." - ms.product: dotnet-desktop - ms.topic: hub-page # Required - ms.collection: collection # Optional; Remove if no collection is used. - author: adegeo - ms.author: adegeo - ms.date: 10/21/2020 - -# highlightedContent section (optional) -# Maximum of 8 items -highlightedContent: -# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new - items: - # Card - - title: "Install Visual Studio 2019" - itemType: download - url: /visualstudio/install/install-visual-studio?view=vs-2019 - # Card - - title: "Create your first WPF app" - itemType: get-started - url: /visualstudio/get-started/csharp/tutorial-wpf?view=vs-2019 - # Card - - title: "Create your first WinForms app" - itemType: get-started - url: /visualstudio/get-started/csharp/tutorial-winforms?view=vs-2019 - -# additionalContent section (optional) -# Card with links style -additionalContent: - # Supports up to 3 sections - sections: - - title: .NET - items: - # Card - - title: Windows Presentation Foundation - links: - - text: Landing page - url: net/wpf/index.yml?view=netdesktop-5.0&preserve-view=true - # Card - - title: Windows Forms - links: - - text: Landing page - url: net/winforms/index.md?view=netdesktop-5.0&preserve-view=true - - - title: .NET Framework # < 60 chars (optional) - items: - # Card - - title: Windows Presentation Foundation - links: - - text: Landing page - url: framework/wpf/index.md?view=netframeworkdesktop-4.8&preserve-view=true - # Card - - title: Windows Forms - links: - - text: Landing page - url: framework/winforms/index.yml?view=netframeworkdesktop-4.8&preserve-view=true - - - title: Other desktop technologies # < 60 chars (optional) - items: - - title: Universal Windows Apps - summary: Universal Windows apps for all devices that run Windows 10 - url: /uwp - - title: Xamarin.Forms - summary: Xamarin.Forms lets you build native apps using a .NET cross-platform UI - url: /xamarin/xamarin-forms/ - - # footer (optional) - footer: "Contribute to .NET docs. Read our [contributor guide](/contribute/dotnet/dotnet-contribute)." \ No newline at end of file