From b6052930c9022747c5ac188dbca93841f58be225 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Fri, 5 Mar 2021 15:41:44 -0800 Subject: [PATCH 1/3] master -> main --- .openpublishing.publish.config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 681027a109f72..586ccaa957b23 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -75,7 +75,7 @@ "Publish", "Pdf" ], - "master": [ + "main": [ "Publish", "Pdf" ] @@ -90,4 +90,4 @@ "name": "docfx_v3" }, "need_generate_intellisense": false -} \ No newline at end of file +} From 2dce862affe598c84793bb555c4a90dc02f8d40d Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Fri, 5 Mar 2021 15:50:23 -0800 Subject: [PATCH 2/3] update links to this repo --- docs/csharp/tutorials/generate-consume-asynchronous-stream.md | 4 ++-- .../tutorials/intro-to-csharp/introduction-to-classes.md | 2 +- .../tutorials/intro-to-csharp/object-oriented-programming.md | 2 +- docs/standard/base-types/parsing-datetime.md | 2 +- docs/visual-basic/getting-started/additional-resources.md | 2 +- docs/visual-basic/getting-started/index.md | 2 +- docs/visual-basic/toc.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/csharp/tutorials/generate-consume-asynchronous-stream.md b/docs/csharp/tutorials/generate-consume-asynchronous-stream.md index c24ca945236ab..e808ce0d283ee 100644 --- a/docs/csharp/tutorials/generate-consume-asynchronous-stream.md +++ b/docs/csharp/tutorials/generate-consume-asynchronous-stream.md @@ -36,7 +36,7 @@ This tutorial assumes you're familiar with C# and .NET, including either Visual ## Run the starter application -You can get the code for the starter application used in this tutorial from the [dotnet/docs](https://github.com/dotnet/docs) repository in the [csharp/tutorials/AsyncStreams](https://github.com/dotnet/docs/tree/master/docs/csharp/tutorials/snippets/generate-consume-asynchronous-streams/start) folder. +You can get the code for the starter application used in this tutorial from the [dotnet/docs](https://github.com/dotnet/docs) repository in the [csharp/tutorials/AsyncStreams](https://github.com/dotnet/docs/tree/main/docs/csharp/tutorials/snippets/generate-consume-asynchronous-streams/start) folder. The starter application is a console application that uses the [GitHub GraphQL](https://developer.github.com/v4/) interface to retrieve recent issues written in the [dotnet/docs](https://github.com/dotnet/docs) repository. Start by looking at the following code for the starter app `Main` method: @@ -138,7 +138,7 @@ You use another extension method, All the C# samples in this article run in your browser. Press the **Run** button to see the output. You can also edit them to experiment yourself. > [!NOTE] -> These examples are available in the GitHub docs repo for both [C#](https://github.com/dotnet/docs/tree/master/samples/snippets/csharp/how-to/conversions) and [Visual Basic](https://github.com/dotnet/docs/tree/master/samples/snippets/visualbasic/how-to/conversions). +> These examples are available in the GitHub docs repo for both [C#](https://github.com/dotnet/docs/tree/main/samples/snippets/csharp/how-to/conversions) and [Visual Basic](https://github.com/dotnet/docs/tree/main/samples/snippets/visualbasic/how-to/conversions). [!code-csharp-interactive[Parsing.DateAndTime#1](../../../samples/snippets/csharp/how-to/conversions/StringToDateTime.cs#1)] [!code-vb[Parsing.DateAndTime#1](../../../samples/snippets/visualbasic/how-to/conversions/Program.vb#1)] diff --git a/docs/visual-basic/getting-started/additional-resources.md b/docs/visual-basic/getting-started/additional-resources.md index 3e4ed460cf5dd..7a0c5282c1371 100644 --- a/docs/visual-basic/getting-started/additional-resources.md +++ b/docs/visual-basic/getting-started/additional-resources.md @@ -26,7 +26,7 @@ The following web sites provide guidance and can help you find answers to common |URL|Description| |----------|----------------| -|[Visual Basic documentation samples](https://github.com/dotnet/docs/tree/master/samples/snippets/visualbasic)|Contains the samples used throughout the Visual Basic and .NET documentation.| +|[Visual Basic documentation samples](https://github.com/dotnet/docs/tree/main/samples/snippets/visualbasic)|Contains the samples used throughout the Visual Basic and .NET documentation.| |[Samples browser](https://docs.microsoft.com/samples/browse/?languages=vb)|Contains code samples written in Visual Basic| ### Forums diff --git a/docs/visual-basic/getting-started/index.md b/docs/visual-basic/getting-started/index.md index 70b96860391d1..d95cd4eb82d0e 100644 --- a/docs/visual-basic/getting-started/index.md +++ b/docs/visual-basic/getting-started/index.md @@ -33,7 +33,7 @@ Provides download links for Visual Studio versions that come with Visual Basic s - [Object-Oriented Programming](../programming-guide/concepts/object-oriented-programming.md) Provides links to pages that introduce object-oriented programming and describe how to create your own objects and how to use objects to simplify your coding. -- [Samples](https://github.com/dotnet/docs/tree/master/samples/snippets/visualbasic) +- [Samples](https://github.com/dotnet/docs/tree/main/samples/snippets/visualbasic) Provides links to sample code in Visual Basic. - [Walkthroughs](../walkthroughs.md) diff --git a/docs/visual-basic/toc.yml b/docs/visual-basic/toc.yml index 431f5d399423c..55658333c87c4 100644 --- a/docs/visual-basic/toc.yml +++ b/docs/visual-basic/toc.yml @@ -1419,6 +1419,6 @@ - name: Language Specification href: reference/language-specification/ - name: Sample Applications - href: https://github.com/dotnet/docs/tree/master/samples/snippets/visualbasic + href: https://github.com/dotnet/docs/tree/main/samples/snippets/visualbasic - name: Walkthroughs href: walkthroughs.md From 8044b7d6e0195de57a5ec8052e8d2862a96fa949 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Fri, 5 Mar 2021 15:52:40 -0800 Subject: [PATCH 3/3] update workflow file --- .github/workflows/build-validation.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 01b3b97fb5768..f9d04359a80eb 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -2,7 +2,7 @@ name: Snippets 5000 # Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch +# events on the main branch only. on: pull_request: paths: @@ -19,7 +19,7 @@ on: - "**.sln" - "**global.json" - "**snippets.5000.json" - branches: [ master, main ] + branches: [ main ] env: DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx' @@ -76,6 +76,3 @@ jobs: - name: Report status run: | ./.github/workflows/dependencies/Out-GithubActionStatus.ps1 - - -