Merge branch 'main' of https://github.com/BagavathiPerumal/maui into fix-26396

# Conflicts:
#	src/Core/src/Platform/Windows/WindowRootView.cs

Author: BagavathiPerumal

.github/CODEOWNERS

@@ -10,6 +10,3 @@
 **/localize/*.json                                     @tj-devel709
 **/*.resx                                              @tj-devel709
 **.*.resx.lcl                                          @tj-devel709
-
-# UI Testing
-/src/Controls/tests/TestCases.*.Tests                  @jfversluis @jsuarezruiz

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,6 +42,8 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 9.0.21 SR2.1
+        - 9.0.14 SR1.4
         - 9.0.12 SR1.2
         - 9.0.10 SR1
         - 9.0.0 GA
@@ -152,6 +154,8 @@ body:
         - 9.0.0 GA
         - 9.0.10 SR1
         - 9.0.12 SR1.2
+        - 9.0.14 SR1.4
+        - 9.0.21 SR2.1
     validations:
       required: true
   - type: dropdown

.gitignore

@@ -382,3 +382,4 @@ snapshots-diff/
 .dotnet
 temp
 .packages
+/src/Templates/.tempTemplateOutput

NuGet.config

@@ -13,8 +13,9 @@
     <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
-    <!-- Added manually for .NET 8 MAUI -->- 
-    <add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" /></packageSources>
+    <!-- Added manually for .NET 8 MAUI --> 
+    <add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
+  </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>

eng/BannedSymbols.txt

@@ -2,4 +2,5 @@ M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescripto
 M:Android.Content.Res.ColorStateList.#ctor(System.Int32[][],System.Int32[]);Use Microsoft.Maui.PlatformInterop.Get*ColorStateList() Java methods instead
 P:Microsoft.Maui.MauiWinUIApplication.Services;Use the IPlatformApplication.Current.Services instead
 P:Microsoft.Maui.MauiWinUIApplication.Application;Use the IPlatformApplication.Current.Application instead
-P:Microsoft.UI.Xaml.Window.AppWindow;This API doesn't have null safety. Use GetAppWindow() and make sure to account for the possibility that GetAppWindow() might be null.
+P:Microsoft.UI.Xaml.Window.AppWindow;This API doesn't have null safety. Use GetAppWindow() and make sure to account for the possibility that GetAppWindow() might be null.
+P:Microsoft.UI.Xaml.Controls.Panel.Children;Use MauiPanel.CachedChildren instead to avoid performance hit

eng/Versions.props

@@ -49,7 +49,7 @@
     <MicrosoftExtensionsLoggingDebugVersion>9.0.0</MicrosoftExtensionsLoggingDebugVersion>
     <MicrosoftExtensionsPrimitivesVersion>9.0.0</MicrosoftExtensionsPrimitivesVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>35.0.7</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>35.0.24</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
     <MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>

eng/configure-toolset.ps1

@@ -0,0 +1,5 @@
+# We can't use already installed dotnet cli since we need to install additional workloads.
+# We could potentially try to find an existing installation that has all the required workloads,
+# but it's unlikely one will be available.
+
+$script:useInstalledDotNetCli = $false

eng/configure-toolset.sh

@@ -0,0 +1,8 @@
+# We can't use already installed dotnet cli since we need to install additional workloads.
+# We could potentially try to find an existing installation that has all the required workloads,
+# but it's unlikely one will be available.
+
+useInstalledDotNetCli="false"
+
+# Working around issue https://github.com/dotnet/arcade/issues/7327
+# DisableNativeToolsetInstalls=true

eng/pipelines/arcade/setup-test-env.yml

@@ -0,0 +1,54 @@
+parameters:
+  mauiSourcePath: $(Build.SourcesDirectory)
+  buildConfig: Debug
+  repoLogPath: $(Build.Arcade.LogsPath)
+  installPackageArtifacts: true
+
+steps:
+- checkout: self
+  fetchDepth: 1
+  clean: true
+
+- template: /eng/pipelines/common/setup-jdk.yml
+
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK $(DOTNET_VERSION)'
+  inputs:
+    packageType: sdk
+    version: $(DOTNET_VERSION)
+    includePreviewVersions: true
+
+
+- ${{ if eq(parameters.installPackageArtifacts, true) }}:
+  - task: DownloadPipelineArtifact@2
+    displayName: Download PackageArtifacts
+    inputs:
+      artifactName: PackageArtifacts
+      itemPattern: '**/*.nupkg'
+      targetPath: ${{ parameters.mauiSourcePath }}/artifacts
+
+  - task: DotNetCoreCLI@2
+    displayName: Install dotnet preview without workloads
+    inputs:
+      projects: ${{ parameters.mauiSourcePath }}/src/DotNet/DotNet.csproj
+      arguments: '-p:InstallWorkloadPacks=false -c ${{ parameters.buildConfig }} -bl:${{ parameters.repoLogPath }}/install-dotnet.binlog'
+
+  - task: DotNetCoreCLI@2
+    displayName: Install dotnet preview workloads from PackageArtifacts
+    inputs:
+      projects: ${{ parameters.mauiSourcePath }}/src/DotNet/DotNet.csproj
+      arguments: '-t:Install -c ${{ parameters.buildConfig }} -bl:${{ parameters.repoLogPath }}/install-dotnet.binlog'
+
+- ${{ else }}:
+  - task: DotNetCoreCLI@2
+    displayName: Install dotnet preview
+    inputs:
+      projects: ${{ parameters.mauiSourcePath }}/src/DotNet/DotNet.csproj
+      arguments: '-c ${{ parameters.buildConfig }} -bl:${{ parameters.repoLogPath }}/install-dotnet.binlog'
+
+  - template: /eng/pipelines/common/run-dotnet-preview.yml
+    parameters:
+      displayName: Build MSBuild Tasks
+      mauiSourcePath: ${{ parameters.mauiSourcePath }}
+      project: ${{ parameters.mauiSourcePath }}/Microsoft.Maui.BuildTasks.slnf
+      arguments: '-c ${{ parameters.buildConfig }} -bl:${{ parameters.repoLogPath }}/Microsoft.Maui.BuildTasks.binlog'

eng/pipelines/arcade/stage-pack.yml

@@ -0,0 +1,95 @@
+# Template for build + pack on dnceng
+parameters:
+- name: pool
+  type: object
+- name: enableSourceBuild
+  type: boolean
+  default: false
+- name: enableSourceIndex
+  type: boolean
+  default: false
+- name: sourceIndexParams
+  type: object
+  default: []
+- name: publishTaskPrefix
+  type: string
+  default: '1ES.'
+
+stages:
+- stage: Pack
+  displayName: Pack .NET MAUI
+  dependsOn: []
+  jobs:
+  - template: /eng/common/templates-official/jobs/jobs.yml
+    parameters:
+      helixRepo: dotnet/maui
+      pool: ${{ parameters.pool }}
+      enableMicrobuild: true
+      enablePublishUsingPipelines: true
+      enablePublishBuildAssets: true
+      enableTelemetry: true
+      enableSourceBuild: ${{ parameters.enableSourceBuild }}
+      enableSourceIndex: ${{ parameters.enableSourceIndex }}
+      sourceIndexParams: ${{ parameters.sourceIndexParams }}
+      publishAssetsImmediately: true
+      enablePublishBuildArtifacts: true
+      enablePublishTestResults: true
+      workspace:
+        clean: all
+      jobs:
+      - job: pack_net_Windows
+        displayName: Pack Windows
+        timeoutInMinutes: 240
+        preSteps:
+        - checkout: self
+          fetchDepth: 1
+          clean: true
+        steps:
+        - template: /eng/pipelines/common/setup-jdk.yml
+
+        - script: $(_buildScript)
+                  -restore -build
+                  -configuration $(_BuildConfig)
+                  /p:ArchiveTests=true
+                  /p:TreatWarningsAsErrors=false
+                  /bl:$(Build.Arcade.LogsPath)build.binlog
+                  $(_OfficialBuildIdArgs)
+          displayName: 🛠️ Build
+
+        # Run on public pipeline
+        - ${{ if eq(variables['_RunAsPublic'], 'true') }}:
+          - script: $(_buildScript)
+                    -restore -pack
+                    -publish $(_PublishArgs)
+                    -configuration $(_BuildConfig)
+                    /bl:$(Build.Arcade.LogsPath)pack.binlog
+                    $(_OfficialBuildIdArgs)
+            displayName: Pack & Publish
+
+        # Run on internal pipeline
+        - ${{ if eq(variables['_RunAsInternal'], 'true') }}:
+          - script: $(_buildScript)
+                    -restore -pack
+                    -sign $(_SignArgs)
+                    -publish $(_PublishArgs)
+                    -configuration $(_BuildConfig)
+                    /bl:$(Build.Arcade.LogsPath)pack.binlog
+                    $(_OfficialBuildIdArgs)
+            displayName: Pack, Sign & Publish
+          
+          # only for workloads
+          - script: $(_buildScript)
+              -restore -build
+              -sign $(_SignArgs)
+              -publish $(_PublishArgs)
+              -configuration $(_BuildConfig)
+              /bl:$(Build.Arcade.LogsPath)/build-workloads.binlog
+              -projects src/Workload/workloads.csproj
+              $(_OfficialBuildIdArgs)
+            displayName: Build Workloads
+
+          - task: ${{ parameters.publishTaskPrefix }}PublishPipelineArtifact@1
+            displayName: Publish VSDrop MSIs
+            inputs:
+              targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
+              artifactName: VSDropInsertion