Merge pull request #4012 from windows-toolkit/branch-update

Update for new branch name

Author: michael-hawker

Directory.Build.props

@@ -4,7 +4,7 @@
     <Authors>Microsoft.Toolkit</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <NoPackageAnalysis>true</NoPackageAnalysis>
-    <PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png</PackageIconUrl>
     <PackageIcon>images\nuget.png</PackageIcon>
     <PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>    
@@ -109,4 +109,4 @@
 
   <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
 
-</Project>
+</Project>

Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec

@@ -8,7 +8,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png</iconUrl>
     <icon>images\nuget.png</icon>
     <description>The official way to send toast notifications on Windows 10 via code rather than XML, with the help of IntelliSense. Supports all C# app types, including WPF, UWP, WinForms, and Console, even without packaging your app as MSIX. Also supports C++ UWP apps.
 

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md

@@ -376,11 +376,11 @@ To add an image, it is almost like a link. You just need to add a \! before.
 
 So inline image syntax looks like this:
 
->\!\[Helpers Image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png)
+>\!\[Helpers Image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png)
 
 which renders in:
 
-![Helpers Image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png)
+![Helpers Image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png)
 
 Rendering Images is now supported through prefix. use property **UriPrefix**
 
@@ -412,11 +412,11 @@ which renders in:
 
 MarkdownTextblock supports links wrapped with Images. 
 
->\[!\[image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/)
+>\[!\[image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/)
 
 will render into 
 
-[![image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/)
+[![image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/)
 
 and when clicked will go to the Linked Page.
 
@@ -425,7 +425,7 @@ MarkdownTextBlock also supports Reference based links.
 ```
 [![image][1]][2]
 
-[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png
+[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png
 [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/
 
 ```
@@ -434,7 +434,7 @@ will render into
 
 [![image][1]][2]
 
-[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png
+[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png
 [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/
 
 *****

Microsoft.Toolkit.Uwp.SampleApp/readme.md

@@ -92,7 +92,7 @@ Therefore, for any new control/extension, you should still have a simplified sni
 
 
 ## 4. For Events/Resource Templates: Have your sample page implement the **IXamlRendererListener** interface
-This gets called whenever the template gets parsed (due to loading or user modification).   Here you can use the [LogicalTree](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/Tree/LogicalTree.cs) extensions to grab named controls in the template and register their events.  **Check for null first** as the developer may have removed the name from the element.
+This gets called whenever the template gets parsed (due to loading or user modification).   Here you can use the [LogicalTree](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp.UI/Extensions/Tree/LogicalTree.cs) extensions to grab named controls in the template and register their events.  **Check for null first** as the developer may have removed the name from the element.
 
 ```csharp
 var markdownText = control.FindChild("MarkdownText") as MarkdownTextBlock;
@@ -148,9 +148,9 @@ Select the category where you want your page to be listed and add the following
         "Name": "AdaptiveGridView",
         "Type": "AdaptiveGridViewPage",
         "About": "The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the total display available space. It reacts to changes in the layout as well as the content so it can adapt to different form factors automatically. The number and the width of items are calculated based on the screen resolution in order to fully leverage the available screen space. The property ItemsHeight define the items fixed height and the property DesiredWidth sets the minimum width for the elements to add a new column.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar",
         "XamlCodeFile": "AdaptiveGridViewCode.bind",
-        "DocumentationUrl": "https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/docs/controls/AdaptiveGridView.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/docs/controls/AdaptiveGridView.md"
       }
     ]
   }
@@ -188,7 +188,7 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 `https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/{branch}/docs/{folder/file.md}`
 
-> NOTE: When building and running the app in release mode, the branch will automatically be changed to **master** before loading. 
+> NOTE: When building and running the app in release mode, the branch will automatically be changed to **main** before loading. 
 
 > NOTE: The documentation is also packaged with the sample app. If there is no network connection, or the documentation is not yet on GitHub, the sample app will use the packaged version
 
@@ -201,4 +201,4 @@ Use the DocumentationUrl property to add a link to the raw documentation in *sam
 
 ### CodeUrl
 
-The value of CodeUrl is modified when the app is built in release mode. The branch is automatically changed to **master**. This allows you to test the link in debug while pointing to dev.
+The value of CodeUrl is modified when the app is built in release mode. The branch is automatically changed to **main**. This allows you to test the link in debug while pointing to dev.

Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistrationBase.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Toolkit.Uwp.Design.Common
 {
     public abstract class MetadataRegistrationBase : IProvideAttributeTable
     {
-        private AttributeTable masterMetadataTable;
+        private AttributeTable mainMetadataTable;
 
         internal MetadataRegistrationBase() { }
 
@@ -36,8 +36,8 @@ protected virtual AttributeTable BuildAttributeTable()
             AddAttributes(builder);
             AddTables(builder, this);
 
-            masterMetadataTable = builder.CreateTable();
-            return masterMetadataTable;
+            mainMetadataTable = builder.CreateTable();
+            return mainMetadataTable;
         }
 
         #region IProvideAttributeTable Members
@@ -250,4 +250,4 @@ protected virtual void AddAttributes(AttributeTableBuilder builder)
         {
         }
     }
-}
+}

Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Toolkit.Uwp.Design.Common
 {
     public abstract class MetadataRegistrationBase : IProvideAttributeTable
     {
-        private AttributeTable masterMetadataTable;
+        private AttributeTable mainMetadataTable;
 
         internal MetadataRegistrationBase() { }
 
@@ -36,8 +36,8 @@ protected virtual AttributeTable BuildAttributeTable()
             AddAttributes(builder);
             AddTables(builder, this);
 
-            masterMetadataTable = builder.CreateTable();
-            return masterMetadataTable;
+            mainMetadataTable = builder.CreateTable();
+            return mainMetadataTable;
         }
 
         #region IProvideAttributeTable Members
@@ -250,4 +250,4 @@ protected virtual void AddAttributes(AttributeTableBuilder builder)
         {
         }
     }
-}
+}

Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj

@@ -7,7 +7,7 @@
       This library provides XAML layout controls. It is part of the Windows Community Toolkit.
 
       Controls:
-        - BladeView: Provides a horizontal collection of blades for master-detail scenarios.
+        - BladeView: Provides a horizontal collection of blades for drilling into detailed scenarios.
         - Carousel: Presents items in a carousel control.
         - Expander: Expander allows user to show/hide content based on a boolean state.
         - GridSplitter: A the control that redistributes space between columns or rows of a Grid control.

azure-pipelines.yml

@@ -1,10 +1,10 @@
 trigger:
-- master
+- main
 - dev/*
 - rel/*
 
 pr:
-- master
+- main
 - dev/*
 - rel/*
 

readme.md

@@ -4,8 +4,8 @@ The Windows Community Toolkit is a collection of helper functions, custom contro
 
 | Target | Branch | Status | Recommended package version |
 | ------ | ------ | ------ | ------ |
-| Production | rel/6.1.0 | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Toolkit-CI?branchName=rel/6.1.0)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=10&branchName=rel/6.1.0) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.svg)](https://www.nuget.org/profiles/Microsoft.Toolkit) | 
-| Pre-release beta testing | master | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Toolkit-CI?branchName=master)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=10) | [![DevOps](https://vsrm.dev.azure.com/dotnet/_apis/public/Release/badge/696bc9fd-f160-4e97-a1bd-7cbbb3b58f66/1/1)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=feed&feed=WindowsCommunityToolkit-MainLatest) |
+| Production | rel/7.0.2 | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Toolkit-CI?branchName=rel/7.0.2)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=10&branchName=rel/7.0.2) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.svg)](https://www.nuget.org/profiles/Microsoft.Toolkit) | 
+| Pre-release beta testing | main | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Toolkit-CI?branchName=main)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=10) | [![DevOps](https://vsrm.dev.azure.com/dotnet/_apis/public/Release/badge/696bc9fd-f160-4e97-a1bd-7cbbb3b58f66/1/1)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=feed&feed=WindowsCommunityToolkit-MainLatest) |
 
 ## Getting Started :raised_hands:
 Please read the [Getting Started with the Windows Community Toolkit](https://docs.microsoft.com/windows/communitytoolkit/getting-started) page for more detailed information about using the toolkit.

version.json

@@ -1,7 +1,7 @@
 {
   "version": "7.0.0-build.{height}",
   "publicReleaseRefSpec": [
-    "^refs/heads/master$", // we release out of master
+    "^refs/heads/main$", // we release out of main
     "^refs/heads/dev$", // we release out of dev
     "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
   ],