Merge branch 'main' into fix-altgr-texttoolbar

Author: dgellow

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/EnumValuesExtension/AnimalToColorConverter.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using Microsoft.Toolkit.Uwp.SampleApp.Enums;
 using Windows.UI;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.Converters
@@ -21,7 +22,7 @@ public object Convert(object value, Type targetType, object parameter, string la
                 Animal.Llama => Colors.Beige,
                 Animal.Parrot => Colors.YellowGreen,
                 Animal.Squirrel => Colors.SaddleBrown,
-                _ => throw new ArgumentException("Invalid value", nameof(value))
+                _ => DependencyProperty.UnsetValue
             };
         }
 

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionCode.bind

@@ -20,7 +20,7 @@ public sealed class AnimalToColorConverter : IValueConverter
             Animal.Bunny => Colors.Green,
             Animal.Parrot => Colors.YellowGreen,
             Animal.Squirrel => Colors.SaddleBrown,
-            _ => throw new ArgumentException("Invalid value", nameof(value))
+            _ => DependencyProperty.UnsetValue
         };
     }
 

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.Animations/Expressions/ExpressionNodes/ExpressionNode.cs

@@ -282,14 +282,10 @@ internal void EnsureReferenceInfo()
                 }
 
                 // Create a map to store the generated paramNames for each CompObj
-                uint id = 0;
                 _compObjToParamNameMap = new Dictionary<CompositionObject, string>();
                 foreach (var compObj in compObjects)
                 {
-                    // compObj.ToString() will return something like "Windows.UI.Composition.SpriteVisual"
-                    // Make it look like "SpriteVisual_1"
-                    string paramName = compObj.ToString();
-                    paramName = $"{paramName.Substring(paramName.LastIndexOf('.') + 1)}_{++id}";       // make sure the created param name doesn't overwrite a custom name
+                    string paramName = Guid.NewGuid().ToUppercaseAsciiLetters();
 
                     _compObjToParamNameMap.Add(compObj, paramName);
                 }

Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/GuidExtensions.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Toolkit.Uwp.UI.Animations
+{
+    /// <summary>
+    /// An extension <see langword="class"/> for the <see cref="Guid"/> type
+    /// </summary>
+    internal static class GuidExtensions
+    {
+        /// <summary>
+        /// Returns a <see cref="string"/> representation of a <see cref="Guid"/> only made of uppercase letters
+        /// </summary>
+        /// <param name="guid">The input <see cref="Guid"/> to process</param>
+        /// <returns>A <see cref="string"/> representation of <paramref name="guid"/> only made up of letters in the [A-Z] range</returns>
+        [Pure]
+        public static string ToUppercaseAsciiLetters(in this Guid guid)
+        {
+            // Composition IDs must only be composed of characters in the [A-Z0-9_] set,
+            // and also have the restriction that the initial character cannot be a digit.
+            // Because of this, we need to prepend an underscore to a serialized guid to
+            // avoid cases where the first character is a digit. Additionally, we're forced
+            // to use ToUpper() here because ToString("N") currently returns a lowercase
+            // hexadecimal string. Note: this extension might be improved once we move to
+            // .NET 5 in the WinUI 3 release, by using string.Create<TState>(...) to only
+            // have a single string allocation, and then using Guid.TryFormat(...) to
+            // serialize the guid in place over the Span<char> starting from the second
+            // character. For now, this implementation is fine on UWP and still fast enough.
+            return $"_{guid.ToString("N").ToUpper()}";
+        }
+    }
+}

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.Input/ColorPicker/ColorPicker.Properties.cs

@@ -20,7 +20,7 @@ public partial class ColorPicker
                 nameof(CustomPaletteColors),
                 typeof(ObservableCollection<Windows.UI.Color>),
                 typeof(ColorPicker),
-                new PropertyMetadata(Windows.UI.Color.FromArgb(0x00, 0x00, 0x00, 0x00)));
+                new PropertyMetadata(null));
 
         /// <summary>
         /// Gets the list of custom palette colors.
@@ -64,7 +64,7 @@ public int CustomPaletteColumnCount
                 nameof(CustomPalette),
                 typeof(IColorPalette),
                 typeof(ColorPicker),
-                new PropertyMetadata(DependencyProperty.UnsetValue));
+                new PropertyMetadata(null));
 
         /// <summary>
         /// Gets or sets the custom color palette.