Merge branch 'master' into PageNavigation

Author: peterfoot

.DS_Store

@@ -0,0 +1,23 @@
+jobs:
+- job: Build
+  dependsOn: VS_Latest
+
+  pool:
+    vmImage: 'windows-2022'
+
+  strategy:
+    # matrix:
+    #   Commerce:
+    #     solutionPath: 'D:\a\1\s\reference\Commerce\Commerce.sln'
+    #   NotChanged:
+    #     solutionPath: 'D:\a\1\s\UI\AdvancedXBind\AdvancedXBind.sln'
+    matrix: $[ dependencies.VS_Latest.outputs['generateJson.samplesJson'] ]
+  
+  variables:
+    - name: UseDotNetNativeToolchain
+      value: false
+
+  steps:
+  - template: build-samples.yml
+    parameters:
+      path: $(solutionPath)

.azure-pipelines.BuildMatrix.yml

@@ -242,3 +242,5 @@ msbuild.binlog
 /Uno/Uno.UI.TestComparer/Properties/launchSettings.json
 *.diagsession
 
+/UI/MauiEmbedding/GrialKitApp/nuget.config
+/UI/MauiEmbedding/GrialKitApp/GrialKitApp.MauiControls/GrialLicense

.gitignore

@@ -7,34 +7,21 @@ steps:
     dotnet sln Uno.Samples.generated.sln add (Get-ChildItem -Recurse *.csproj)
     $env:MSBuildExtensionsPath = $savedMSBuildExtensionsPath
 
-- task: UseDotNet@2
-  inputs:
-    packageType: 'runtime'
-    version: '2.2.0'
-
 - task: nventiveCanaryUpdater@5
+  displayName: 'Canary Update'
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries')
   inputs:
     solution: Uno.Samples.generated.sln
     usePrivateFeed: false
     useNuGetOrg: true
-    mergeBranch: false
-    nugetUpdaterVersion: '2.1.1'
-    allowDowngrade: true
-    packageAuthor: 'nventive'
+    mergeBranch: true
+    branchToMerge: master
+    nugetUpdaterVersion: '2.3.0-alpha.46'
+    nugetVersion: dev
+    packageAuthor: 'nventive,unoplatform,uno platform'
     summaryFile: '$(Build.ArtifactStagingDirectory)/Summary.md'
     resultFile: '$(Build.ArtifactStagingDirectory)/Results.json'
+    additionalPublicSources: 'https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/dev-uno5/nuget/v3/index.json'
 
-- powershell: |
-    dotnet tool uninstall nventive.nuget.updater.tool --tool-path $(Agent.TempDirectory)
-
-- task: nventiveCanaryUpdater@5
-  inputs:
-    solution: Uno.Samples.generated.sln
-    usePrivateFeed: false
-    useNuGetOrg: true
-    mergeBranch: false
-    nugetUpdaterVersion: '2.1.1'
-    allowDowngrade: true
-    packageAuthor: 'Uno Platform'
-    summaryFile: '$(Build.ArtifactStagingDirectory)/Summary-Uno.md'
-    resultFile: '$(Build.ArtifactStagingDirectory)/Results-Uno.json'
+- pwsh: |
+    del Uno.Samples.generated.sln

.vsts-ci.canaries.yml

@@ -1,6 +1,6 @@
 jobs:
 - job: VS_Latest
-  timeoutInMinutes: 240
+  timeoutInMinutes: 600
 
   pool:
     vmImage: windows-2022
@@ -9,53 +9,41 @@ jobs:
   - checkout: self
     clean: true
 
-  - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') }}:
-    - template: .vsts-ci.canaries.yml
-
-  # Restore nuget.org to the list of existing sources, .NET 6 Pre 2 may somehow remove it
-  - powershell: |
-      dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org | Out-Null
-      $global:LASTEXITCODE = 0
-    displayName: Adjust nuget.org source
-
-  - template: build/templates/dotnet6-install-windows.yml
-
   - powershell: |
-        & choco install vswhere
-        $msbuildpath=(vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe -nologo)
-
-        echo "##vso[task.setvariable variable=msbuildpath]$msbuildpath"
-    displayName: Set MSBUILDPATH
-
-  - powershell: |
-      Set-PSDebug -Trace 1
-
-      $SolutionsToBuild =  Get-ChildItem -Path **\*.sln -Recurse  | Where-Object {$_.FullName -notmatch "\\ArchivedProjects\\"}
-
       if($env:System_PullRequest_TargetBranch -eq $null) { $TargetBranch = "master" } else { $TargetBranch = $env:System_PullRequest_TargetBranch; }
 
-      foreach ($SolutionName in $SolutionsToBuild) {
+      $dict = New-Object 'System.Collections.Generic.Dictionary[String,System.Collections.Generic.Dictionary[String,String]]'
+      $samples = Get-ChildItem -Path **\*.sln -Recurse | Where-Object {$_.FullName -notmatch "\\ArchivedProjects\\"}
+      foreach($sample in $samples){
 
-           $solutionPath=[System.IO.Path]::GetDirectoryName($SolutionName);
-           git diff --quiet HEAD "origin/$TargetBranch" -- "$solutionPath"
+        $solutionPath=[System.IO.Path]::GetDirectoryName($sample.FullName);
+        Write-Host "$solutionPath"
 
-           # Only build if there a change in the solution path for the current PR, if we're not in a PR
-           if( ('$env:System_PullRequest_PullRequestId)' -eq '') -or ($global:LASTEXITCODE -ne 0)) {
+        git diff --quiet HEAD "origin/$TargetBranch" -- "$solutionPath"
 
-                & $env:msbuildpath $SolutionName /r /p:Configuration=Release /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false /ds ;
+        # Only build if there a change in the solution path for the current PR, if we're not in a PR
+        if( ("$env:System_PullRequest_PullRequestId" -eq '') -or ($global:LASTEXITCODE -ne 0)) {
+          Write-Host "Adding $solutionPath"
+          $item = New-Object 'System.Collections.Generic.Dictionary[String,String]'
+          $item.Add("solutionPath", $sample.FullName)
+          $name = $sample.Name.Split(".")[0]
+          if(!$dict.ContainsKey($name)){
+            $dict.Add($name, $item)
+          }
+        }
+        $global:LASTEXITCODE = 0
 
-                if (($lastexitcode -ne 0)) {
-                    exit $lastexitcode
-                }
-
-                # Clean the whole tree after every build to avoid disk space issues
-                git clean -fdx
-           }
-          
       }
 
-    displayName: Build samples
+      $SolutionsJson = $dict | ConvertTo-Json -Compress
+      
+      Write-Host $SolutionsJson
+      Write-Host "##vso[task.setvariable variable=samplesJson;isOutput=true]$SolutionsJson"
+    name: generateJson
+    displayName: Generate Json of Samples
+
+- template: .azure-pipelines.BuildMatrix.yml
 
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
+  # - task: PublishBuildArtifacts@1
+  #   inputs:
+  #     pathtoPublish: $(Build.ArtifactStagingDirectory)

.vsts-ci.yml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+		<add key="uno dev" value="https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/unoplatformdev/nuget/v3/index.json" />
+	</packageSources>
+</configuration>