Merge branch 'main' into mstest-sdk

Author: Arlodotexe

.config/dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "uno.check": {
-      "version": "1.27.4",
+      "version": "1.33.1",
       "commands": [
         "uno-check"
       ]
     },
     "xamlstyler.console": {
-      "version": "3.2206.4",
+      "version": "3.2501.8",
       "commands": [
         "xstyler"
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "11.2.3",
+      "version": "12.0.13",
       "commands": [
         "slngen"
       ]

.github/workflows/build.yml

@@ -25,7 +25,7 @@ env:
 jobs:
   # This workflow contains a single job called "Xaml-Style-Check"
   Xaml-Style-Check:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -89,7 +89,7 @@ jobs:
 
   # Test job to build the project template
   project-template:
-    runs-on: windows-latest
+    runs-on: windows-2022
     env:
       HEADS_DIRECTORY: tooling/ProjectHeads
       PROJECT_DIRECTORY: tooling/ProjectTemplate
@@ -139,7 +139,7 @@ jobs:
 
   # Test job to build a single experiment to ensure our changes work for both our main types of solutions at the moment
   new-experiment:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     strategy:
       fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.

.github/workflows/config/nuget.config

@@ -2,7 +2,6 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="MainLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" protocolVersion="3" />
   </packageSources>
   <disabledPackageSources>
     <clear />

Build-Toolkit-Components.ps1

@@ -59,7 +59,7 @@
 Param (
     [ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
     [Alias("mt")]
-    [string[]]$MultiTargets = @('uwp', 'wasm'), # default settings
+    [string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'), # default settings
 
     [ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
     [string[]]$ExcludeMultiTargets = @(), # default settings
@@ -85,7 +85,7 @@ Param (
     [hashtable]$AdditionalProperties,
 
     [Alias("winui")]
-    [int]$WinUIMajorVersion = 2,
+    [int]$WinUIMajorVersion = 3,
 
     [string]$ComponentDir = "src",
 
@@ -95,9 +95,6 @@ Param (
     [switch]$Verbose
 )
 
-# Use the specified MultiTarget TFM and WinUI version
-& $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion
-& $PSScriptRoot\MultiTarget\UseTargetFrameworks.ps1 -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets
 
 if ($MultiTargets -eq 'all') {
     $MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')
@@ -110,28 +107,32 @@ if ($null -eq $ExcludeMultiTargets)
 
 # Both uwp and wasdk share a targetframework. Both cannot be enabled at once.
 # If both are supplied, remove one based on WinUIMajorVersion.
-if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk'))
+if ($WinUIMajorVersion -eq 2)
 {
-    if ($WinUIMajorVersion -eq 2)
-    {
-        $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
-    }
-    else
-    {
-        $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
-    }
+    $ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
+}
+
+if ($WinUIMajorVersion -eq 3)
+{
+    $ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
 }
 
 $MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
 
-if ($Components -eq @('all')) {
-    $Components = @('**')
-}
+Write-Output "Building components '$Components' for MultiTargets: $MultiTargets"
 
 if ($ExcludeComponents) {
     $Components = $Components | Where-Object { $_ -notin $ExcludeComponents }
 }
 
+# Use the specified MultiTarget TFM and WinUI version
+# WinUI 0 indicates non-WinUI projects (e.g. netstandard) should be built.
+if ($WinUIMajorVersion -ne 0) {
+    & $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion
+}
+
+& $PSScriptRoot\MultiTarget\UseTargetFrameworks.ps1 -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets
+
 function Invoke-MSBuildWithBinlog {
     param (
         [string]$TargetHeadPath
@@ -207,11 +208,9 @@ function Invoke-MSBuildWithBinlog {
     }
 }
 
-# List of WinUI-2 compatible multitargets
-$WinUI2MultiTargets = @('uwp', 'wasm', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
-
-# List of WinUI-3 compatible multitargets
-$WinUI3MultiTargets = @('wasdk', 'wasm', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
+if ($Components -eq @('all')) {
+    $Components = @('**')
+}
 
 # Components are built individually
 foreach ($ComponentName in $Components) {
@@ -228,40 +227,21 @@ foreach ($ComponentName in $Components) {
         # Get supported MultiTarget for this component
         $supportedMultiTargets = & $PSScriptRoot\MultiTarget\Get-MultiTargets.ps1 -component $componentName
 
-        # If the component does not support at least one target that supports the requested WinUI major version, skip the component
-        $isWinUIMajorVersionSupported = $false
-        
-        # Flag to check if any of the requested targets are supported by the component
-        $isRequestedTargetSupported = $false
-
-        foreach ($requestedTarget in $MultiTargets) {
-            if ($false -eq $isRequestedTargetSupported) {
-                $isRequestedTargetSupported = $requestedTarget -in $supportedMultiTargets
-            }
-        }
-
-        foreach ($supportedMultiTarget in $supportedMultiTargets) {
-            if ($false -eq $isWinUIMajorVersionSupported) {
-                if ($WinUIMajorVersion -eq 2) {
-                    $isWinUIMajorVersionSupported = $supportedMultiTarget -in $WinUI2MultiTargets;
-                }
-
-                if ($WinUIMajorVersion -eq 3) {
-                    $isWinUIMajorVersionSupported = $supportedMultiTarget -in $WinUI3MultiTargets;
-                }
-            }
-        }
-
-        # If none of the requested targets are supported by the component, we can skip build to save time and avoid errors.
-        if (-not $isRequestedTargetSupported) {
-            Write-Warning "Skipping $($componentPath.BaseName), none of the requested MultiTargets '$MultiTargets' are enabled for this component."
+        $shouldBuild = & $PSScriptRoot\MultiTarget\Test-Component-Support.ps1 `
+            -RequestedMultiTargets $MultiTargets `
+            -SupportedMultiTargets $supportedMultiTargets `
+            -Component $componentName `
+            -WinUIMajorVersion $WinUIMajorVersion
+
+        if (-not $shouldBuild.IsSupported) {
+            Write-Warning "Skipping $componentName. $($shouldBuild.Reason)"
             continue
         }
 
-        if (-not $isWinUIMajorVersionSupported) {
-            Write-Warning "Skipping $($componentPath.BaseName), none of the supported MultiTargets '$supportedMultiTargets' support WinUI $WinUIMajorVersion."
-            continue
-        }
+        # Filter ExcludeMultiTargets out of supportedMultiTargets
+        # For display purposes only. The actual build uses the EnabledMultiTargets.props + EnabledTargetFrameworks.props to calculate supported targets at build time.
+        $supportedMultiTargets = $supportedMultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
+        Write-Output "Building $componentName for MultiTargets '$supportedMultiTargets'"
 
         Invoke-MSBuildWithBinlog $componentCsproj.FullName $EnableBinLogs $BinlogOutput
     }

Build-Toolkit-Docs.ps1

@@ -37,7 +37,7 @@ function ProcessMarkdownFile($markdownFile) {
 
   # Insert Header
   $contents = $contents.Substring(0, $endIndex + 5) + "`n# $header`n" + $contents.Substring($endIndex + 5)
-  
+
   # Find Sample Placeholders, replace with code content
   foreach ($sample in ($contents | Select-String -Pattern '>\s*\[!SAMPLE\s*(?<sampleid>.*)\s*\]\s*' -AllMatches).Matches) {
     $sampleid = $sample.Groups[1].Value
@@ -47,8 +47,8 @@ function ProcessMarkdownFile($markdownFile) {
     foreach ($csFile in Get-ChildItem -Recurse -Path ($markdownFile.DirectoryName + '\**\*.xaml.cs').Replace('\', '/') |
       Where-Object { $_.FullName -notlike "*\bin\*" -and $_FullName -notlike "*\obj\*" }) {
       $csSample = Get-Content $csFile -Raw
-          
-      if ($csSample -match '\[ToolkitSample\s?\(\s*id:\s*(?:"|nameof\()\s?' + $sampleid + '\s?(?:"|\))') {
+
+      if ($csSample -match '\[ToolkitSample\s?\(\s*(?:id\:)?\s*(?:"|nameof\()\s?' + $sampleid + '\s?(?:"|\))') {
         # Get Relative Path
         $docPath = $(Join-Path "components" $($csfile.FullName.Replace($componentsRoot.Path, ''))).Replace('\', '/').Trim('/')
 

Build-Toolkit-Gallery.ps1

@@ -69,7 +69,7 @@ Param (
   [hashtable]$AdditionalProperties,
 
   [Alias("winui")]
-  [int]$WinUIMajorVersion = 2,
+  [int]$WinUIMajorVersion = 3,
 
   [Alias("c")]
   [string[]]$Components = @("all"),

CommunityToolkit.App.Shared/Pages/Shell.xaml.cs

@@ -27,6 +27,8 @@ public Shell()
         BackdropMaterial.SetApplyToRootOrPageBackground(this, true);
 #endif
         Current = this;
+
+        Loaded += Shell_Loaded;
     }
 
     /// <summary>
@@ -36,9 +38,13 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         samplePages = e.Parameter as IEnumerable<ToolkitFrontMatter>;
         SetupNavigationMenu();
-        base.OnNavigatedTo(e); 
+        base.OnNavigatedTo(e);
     }
 
+    private void Shell_Loaded(object sender, RoutedEventArgs e)
+    {
+        searchBox.Focus(FocusState.Programmatic);
+    }
 
     private void SetupNavigationMenu()
     {

CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml

@@ -1,4 +1,4 @@
-<!--  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.  -->
+<!--  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.  -->
 <Page x:Class="CommunityToolkit.App.Shared.Renderers.ToolkitDocumentationRenderer"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -230,7 +230,7 @@
                     </StackPanel>
                     <interactivity:Interaction.Behaviors>
                         <interactivity:EventTriggerBehavior EventName="Click">
-                            <behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToComponentUri(Metadata.ComponentName), Mode=OneWay}" />
+                            <behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToComponentUri(Metadata.ComponentName, Metadata.IsExperimental), Mode=OneWay}" />
                         </interactivity:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </Button>
@@ -258,16 +258,16 @@
                                            Text="NuGet package" />
                                 <TextBlock IsTextSelectionEnabled="True">
                                     <Hyperlink FontFamily="Consolas"
-                                               NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageUri('Uwp', Metadata.CsProjName), Mode=OneWay}"
+                                               NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageUri('Uwp', Metadata.CsProjName, Metadata.IsExperimental), Mode=OneWay}"
                                                TextDecorations="None">
-                                        <Run Text="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageName('Uwp', Metadata.CsProjName), Mode=OneWay}" />
+                                        <Run Text="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageName('Uwp', Metadata.CsProjName, Metadata.IsExperimental), Mode=OneWay}" />
                                     </Hyperlink>
                                 </TextBlock>
                                 <TextBlock IsTextSelectionEnabled="True">
                                     <Hyperlink FontFamily="Consolas"
-                                               NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageUri('WinUI', Metadata.CsProjName), Mode=OneWay}"
+                                               NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageUri('WinUI', Metadata.CsProjName, Metadata.IsExperimental), Mode=OneWay}"
                                                TextDecorations="None">
-                                        <Run Text="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageName('WinUI', Metadata.CsProjName), Mode=OneWay}" />
+                                        <Run Text="{x:Bind renderer:ToolkitDocumentationRenderer.ToPackageName('WinUI', Metadata.CsProjName, Metadata.IsExperimental), Mode=OneWay}" />
                                     </Hyperlink>
                                 </TextBlock>
                             </StackPanel>

CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs

@@ -216,11 +216,35 @@ private async void MarkdownTextBlock_LinkClicked(object sender, LinkClickedEvent
 
     public static Uri? ToGitHubUri(string path, int id) => IsProjectPathValid() ? new Uri($"{ProjectUrl}/{path}/{id}") : null;
 
-    public static Uri? ToComponentUri(string name) => IsProjectPathValid() ? new Uri($"{ProjectUrl}/tree/main/components/{name}") : null;
+    public static Uri? ToComponentUri(string name, bool? isExperimental = null)
+    {
+        if (IsProjectPathValid() is not true)
+        {
+            return null;
+        }
 
-    public static Uri? ToPackageUri(string platform, string projectFileName) => new Uri($"https://www.nuget.org/packages/{RemoveFileExtension(projectFileName).Replace("WinUI", platform)}");
+        string? url = (isExperimental is null || isExperimental is false)
+            ? ProjectUrl
+            : ProjectUrl?.Replace("Windows", "Labs-Windows");
 
-    public static string ToPackageName(string platform, string projectFileName) => RemoveFileExtension(projectFileName).Replace("WinUI", platform);
+        return new Uri($"{url}/tree/main/components/{name}");
+    }
+
+    public static Uri? ToPackageUri(string platform, string projectFileName, bool? isExperimental = null)
+    {
+        if (isExperimental is null || isExperimental is false)
+        {
+            return new Uri($"https://www.nuget.org/packages/{ToPackageName(platform, projectFileName, isExperimental)}");
+        }
+        else
+        {
+            // Labs feed for experimental packages (currently)
+            // See inconsistency for Labs package names/project names https://github.com/CommunityToolkit/Windows/issues/587#issuecomment-2738529086
+            return new Uri($"https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-Labs/NuGet/{ToPackageName(platform, projectFileName, isExperimental)}");
+        }
+    }
+    
+    public static string ToPackageName(string platform, string projectFileName, bool? isExperimental) => RemoveFileExtension(projectFileName).Replace("CommunityToolkit.WinUI", isExperimental == true ? "CommunityToolkit.Labs.WinUI" : "CommunityToolkit.WinUI").Replace("WinUI", platform);
 
     // TODO: Think this is most of the special cases with Controls and the Extensions/Triggers using the base namespace
     // See: https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/105#issuecomment-1698306420