From ac01f4ec63505d8e72b8d6ed0cd036c5e1ffd57e Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 30 May 2025 14:52:35 -0400 Subject: [PATCH 1/5] Update landing pages --- docs/csharp/index.yml | 14 +++++++--- docs/csharp/tour-of-csharp/index.yml | 40 +++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index 9c985e9031b1f..1272ee18e5598 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -253,6 +253,8 @@ additionalContent: text: Azure for .NET developers - url: /dotnet/aspire text: .NET Aspire + - url: /dotnet/aspire/get-started/quickstart-build-your-first-aspire-app + text: Build cloud-native apps with .NET Aspire - url: ../azure/migration/app-service.md?preserve-view=true&view=azure-dotnet text: Migrate on-premises .NET web apps or services - url: ../azure/key-azure-services.md @@ -303,17 +305,21 @@ additionalContent: summary: API reference documentation for .NET url: ../../api/index.md # Card - - title: ".NET Framework API reference" - summary: API reference documentation for .NET Framework - url: ../../api/index.md?view=netframework-4.8&preserve-view=true - # Card - title: "ASP.NET Core API reference" summary: API reference documentation for ASP.NET Core url: ../../api/index.md # Card + - title: ".NET Aspire API reference" + summary: Reference documentation for .NET Aspire + url: ../api/index.md?view=dotnet-aspire-9.0&preserve-view=true + # Card - title: "ML.NET API reference" summary: API reference documentation for ML.NET url: ../../api/index.md + # Card + - title: ".NET Framework API reference" + summary: API reference documentation for .NET Framework + url: ../../api/index.md?view=netframework-4.8&preserve-view=true # footer (Optional; Remove if not applicable.) footer: "Are you interested in contributing to the .NET docs? For more information, see our [contributor guide](/contribute/dotnet/dotnet-contribute)." diff --git a/docs/csharp/tour-of-csharp/index.yml b/docs/csharp/tour-of-csharp/index.yml index 754d986f5e591..c00be686c3d24 100644 --- a/docs/csharp/tour-of-csharp/index.yml +++ b/docs/csharp/tour-of-csharp/index.yml @@ -7,7 +7,7 @@ metadata: title: "C# docs - get started, tutorials, reference." description: "Learn C# programming - for beginning developers, developers new to C#, and experienced C# / .NET developers" ms.topic: landing-page # Required - ms.date: 05/08/2024 + ms.date: 05/29/2025 landingContent: @@ -17,6 +17,8 @@ landingContent: links: - text: Learn C# | Tutorials, courses, videos, and more url: https://dotnet.microsoft.com/learn/csharp + - text: Beginner C# tutorials in your browser + url: ./tutorials/index.md - linkListType: video links: - text: "C# beginner video series" @@ -48,6 +50,8 @@ landingContent: url: ../fundamentals/program-structure/index.md - text: "C# highlights video series" url: https://youtube.com/playlist?list=PLdo4fOcmZ0oU3ZLx6Ul1_HPrr6lFPIn9O + - text: C# Language development strategy + url: ./strategy.md - linkListType: concept links: - text: "Type system" @@ -114,6 +118,14 @@ landingContent: url: ../linq/index.md - text: "Asynchronous programming" url: ../programming-guide/concepts/async/index.md + - linkListType: learn + links: + - text: Learn C# for Java developers + url: tour-of-csharp/tips-for-java-developers.md + - text: Learn C# for JavaScript developers + url: tour-of-csharp/tips-for-javascript-developers.md + - text: Learn C# for Python developers + url: tour-of-csharp/tips-for-python-developers.md - title: "Advanced concepts" linkLists: @@ -130,6 +142,32 @@ landingContent: - text: ".NET Compiler Platform SDK" url: ../roslyn-sdk/index.md + - title: "C# language reference" + linkLists: + - linkListType: reference + links: + - text: "Language reference" + url: ./language-reference/index.yml + - text: "Keywords" + url: ./language-reference/keywords/index.md + - text: "Operators and expressions" + url: ./language-reference/operators/index.md + - text: Statements + url: ./language-reference/statements/index.md + - text: "Tokens" + url: ./language-reference/tokens/index.md + + - title: "C# language standard" + linkLists: + - linkListType: reference + links: + - text: "Overview" + url: ./specification/overview.md + - text: "C# language specification" + url: ../../../_csharpstandard/standard/README.md + - text: "Feature specifications" + url: ./specification/feature-spec-overview.md + - title: "Stay in touch" linkLists: - linkListType: reference From 68bc8594293c6204361e61e3febea2f814dcc980 Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 30 May 2025 15:47:22 -0400 Subject: [PATCH 2/5] fix build warnings --- docs/csharp/index.yml | 2 +- docs/csharp/tour-of-csharp/index.yml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index 1272ee18e5598..9d415e1700121 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -311,7 +311,7 @@ additionalContent: # Card - title: ".NET Aspire API reference" summary: Reference documentation for .NET Aspire - url: ../api/index.md?view=dotnet-aspire-9.0&preserve-view=true + url: ../../api/index.md?view=dotnet-aspire-9.0&preserve-view=true # Card - title: "ML.NET API reference" summary: API reference documentation for ML.NET diff --git a/docs/csharp/tour-of-csharp/index.yml b/docs/csharp/tour-of-csharp/index.yml index c00be686c3d24..b0b93956a5e39 100644 --- a/docs/csharp/tour-of-csharp/index.yml +++ b/docs/csharp/tour-of-csharp/index.yml @@ -109,7 +109,7 @@ landingContent: - linkListType: overview links: - text: C# language strategy - url: ../tour-of-csharp/strategy.md + url: ./strategy.md - text: "Programming concepts" url: ../programming-guide/concepts/index.md - linkListType: concept @@ -121,11 +121,11 @@ landingContent: - linkListType: learn links: - text: Learn C# for Java developers - url: tour-of-csharp/tips-for-java-developers.md + url: ./tips-for-java-developers.md - text: Learn C# for JavaScript developers - url: tour-of-csharp/tips-for-javascript-developers.md + url: ./tips-for-javascript-developers.md - text: Learn C# for Python developers - url: tour-of-csharp/tips-for-python-developers.md + url: ./tips-for-python-developers.md - title: "Advanced concepts" linkLists: @@ -147,26 +147,26 @@ landingContent: - linkListType: reference links: - text: "Language reference" - url: ./language-reference/index.yml + url: ../language-reference/index.yml - text: "Keywords" - url: ./language-reference/keywords/index.md + url: ../language-reference/keywords/index.md - text: "Operators and expressions" - url: ./language-reference/operators/index.md + url: ../language-reference/operators/index.md - text: Statements - url: ./language-reference/statements/index.md + url: ../language-reference/statements/index.md - text: "Tokens" - url: ./language-reference/tokens/index.md + url: ../language-reference/tokens/index.md - title: "C# language standard" linkLists: - linkListType: reference links: - text: "Overview" - url: ./specification/overview.md + url: ../specification/overview.md - text: "C# language specification" url: ../../../_csharpstandard/standard/README.md - text: "Feature specifications" - url: ./specification/feature-spec-overview.md + url: ../specification/feature-spec-overview.md - title: "Stay in touch" linkLists: From e176265cbb01fe4fdf94c33e4e237a75e83ee768 Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 30 May 2025 16:05:18 -0400 Subject: [PATCH 3/5] Update hub pages --- docs/csharp/index.yml | 95 ++++++++++++++-------------- docs/csharp/tour-of-csharp/index.yml | 2 - 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index 9d415e1700121..ea287c9b0f720 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -208,6 +208,34 @@ additionalContent: summary: "You can choose web, mobile, desktop, gaming, IoT, and more." # < 160 chars (optional) items: # Card + - title: Machine learning and AI + links: + - url: ../machine-learning/index.yml + text: Build custom AI solutions with ML.NET + - url: /azure/cognitive-services/ + text: Azure Cognitive Services + - url: /azure/machine-learning + text: Azure Machine Learning + - url: ../fsharp/scenarios/machine-learning.md + text: F# for machine learning + # Card + - title: Cloud + links: + - url: ../azure/index.yml + text: Azure for .NET developers + - url: /dotnet/aspire + text: .NET Aspire + - url: /dotnet/aspire/get-started/quickstart-build-your-first-aspire-app + text: Build cloud-native apps with .NET Aspire + - url: ../azure/migration/app-service.md?preserve-view=true&view=azure-dotnet + text: Migrate on-premises .NET web apps or services + - url: ../azure/key-azure-services.md + text: Azure services for .NET developers + - url: ../azure/sdk/azure-sdk-for-dotnet.md + text: Azure SDK for .NET + - url: ../fsharp/using-fsharp-on-azure/deploying-and-managing.md + text: Deploy Azure resources with F# + # Card - title: Web links: - url: /aspnet/core/tutorials @@ -223,17 +251,6 @@ additionalContent: - url: ../fsharp/scenarios/web-development.md text: F# for web development # Card - - title: Mobile and Desktop - links: - - url: /dotnet/desktop/wpf/ - text: Windows Presentation Foundation - - url: /dotnet/desktop/winforms/ - 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 - # Card - title: Microservices links: - url: ../architecture/dapr-for-net-developers/index.md @@ -247,33 +264,24 @@ additionalContent: - url: ../core/extensions/cloud-service.md text: Deploy a Worker Service to Azure # Card - - title: Cloud - links: - - url: ../azure/index.yml - text: Azure for .NET developers - - url: /dotnet/aspire - text: .NET Aspire - - url: /dotnet/aspire/get-started/quickstart-build-your-first-aspire-app - text: Build cloud-native apps with .NET Aspire - - url: ../azure/migration/app-service.md?preserve-view=true&view=azure-dotnet - text: Migrate on-premises .NET web apps or services - - url: ../azure/key-azure-services.md - text: Azure services for .NET developers - - url: ../azure/sdk/azure-sdk-for-dotnet.md - text: Azure SDK for .NET - - url: ../fsharp/using-fsharp-on-azure/deploying-and-managing.md - text: Deploy Azure resources with F# - # Card - - title: Machine learning and AI + - title: Mobile, Desktop and IoT links: - - url: ../machine-learning/index.yml - text: Build custom AI solutions with ML.NET - - url: /azure/cognitive-services/ - text: Azure Cognitive Services - - url: /azure/machine-learning - text: Azure Machine Learning - - url: ../fsharp/scenarios/machine-learning.md - text: F# for machine learning + - url: /dotnet/desktop/wpf/ + text: Windows Presentation Foundation + - url: /dotnet/desktop/winforms/ + 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: ../iot/index.yml + text: .NET IoT libraries + - url: ../iot/quickstarts/sensehat.md + text: Get started in 5 minutes + - url: ../iot/tutorials/blink-led.md + text: Blink an LED + - url: https://aka.ms/dotnet/beginnervideos/youtube/iot + text: .NET IoT 101 video series # Card - title: Game development links: @@ -285,17 +293,6 @@ additionalContent: text: Build games with C# using the MonoGame library - url: https://docs.unity3d.com/Manual/index.html text: Learn how to use Unity to build 2D and 3D games with C# - # Card - - title: Internet of things (IoT) - links: - - url: ../iot/index.yml - text: .NET IoT libraries - - url: ../iot/quickstarts/sensehat.md - text: Get started in 5 minutes - - url: ../iot/tutorials/blink-led.md - text: Blink an LED - - url: https://aka.ms/dotnet/beginnervideos/youtube/iot - text: .NET IoT 101 video series - title: API and language reference # < 60 chars (optional) summary: Search the .NET API and language reference documentation. # < 160 chars (optional) @@ -311,7 +308,7 @@ additionalContent: # Card - title: ".NET Aspire API reference" summary: Reference documentation for .NET Aspire - url: ../../api/index.md?view=dotnet-aspire-9.0&preserve-view=true + url: ../api/index.md?view=dotnet-aspire-9.0&preserve-view=true # Card - title: "ML.NET API reference" summary: API reference documentation for ML.NET diff --git a/docs/csharp/tour-of-csharp/index.yml b/docs/csharp/tour-of-csharp/index.yml index b0b93956a5e39..5cf2d9f98229b 100644 --- a/docs/csharp/tour-of-csharp/index.yml +++ b/docs/csharp/tour-of-csharp/index.yml @@ -152,8 +152,6 @@ landingContent: url: ../language-reference/keywords/index.md - text: "Operators and expressions" url: ../language-reference/operators/index.md - - text: Statements - url: ../language-reference/statements/index.md - text: "Tokens" url: ../language-reference/tokens/index.md From a5242835f6094e824dcb7e623933cdd31c1c2ab6 Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Fri, 30 May 2025 16:13:49 -0400 Subject: [PATCH 4/5] more warnings. --- docs/csharp/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index ea287c9b0f720..338da35dc420e 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -308,7 +308,7 @@ additionalContent: # Card - title: ".NET Aspire API reference" summary: Reference documentation for .NET Aspire - url: ../api/index.md?view=dotnet-aspire-9.0&preserve-view=true + url: ../../api/index.md?view=dotnet-aspire-9.0&preserve-view=true # Card - title: "ML.NET API reference" summary: API reference documentation for ML.NET From b3c493f76b01d9fe2c7631b88b70c838bcf20770 Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Mon, 2 Jun 2025 10:12:20 -0400 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --- docs/csharp/index.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/csharp/index.yml b/docs/csharp/index.yml index 338da35dc420e..61a96c6b2d952 100644 --- a/docs/csharp/index.yml +++ b/docs/csharp/index.yml @@ -264,7 +264,7 @@ additionalContent: - url: ../core/extensions/cloud-service.md text: Deploy a Worker Service to Azure # Card - - title: Mobile, Desktop and IoT + - title: Mobile, Desktop, and IoT links: - url: /dotnet/desktop/wpf/ text: Windows Presentation Foundation @@ -277,7 +277,7 @@ additionalContent: - url: ../iot/index.yml text: .NET IoT libraries - url: ../iot/quickstarts/sensehat.md - text: Get started in 5 minutes + text: Get started with IOT in 5 minutes - url: ../iot/tutorials/blink-led.md text: Blink an LED - url: https://aka.ms/dotnet/beginnervideos/youtube/iot