[net9.0] Merge main to net9

.gitignore

@@ -13,6 +13,7 @@ templatesTest/
 *.user
 *.userosscache
 *.sln.docstates
+/src/Controls/tests/TestCases.HostApp/MauiProgram.user.cs
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

docs/design/UITesting.md

@@ -26,6 +26,25 @@ This will be the majority of new tests added which will be primarily for testing
 You will need to create some kind of UI to test against, which will go in the Controls.TestCases.HostApp project. This will be an actual MAUI app under test and has no dependency on Appium. Create a new class within `src/Controls/tests/TestCases.HostApp/Issues` and attribute it with `[Issue]`. Create it like any normal page you would make in app to reproduce the issue. This could be just in XAML or just code, along with a screenshot.
 This project requires a rebuild after making changes because the `Controls.TestCases.Shared.Tests` is loosely coupled to this project. It initiates a previously compiled executable from `src/Controls/tests/TestCases.HostApp`.
 
+When working on a single test case it may be convenient to start the app by using the issue page as the main one.
+This can be easily achieved by creating a `MauiProgram.user.cs` file in the `src/Controls/tests/TestCases.HostApp` folder and adding the following code:
+
+```csharp
+using Controls.TestCases.HostApp.Issues;
+
+namespace Maui.Controls.Sample;
+
+public partial class MauiProgram
+{
+	static partial void OverrideMainPage(ref Page mainPage)
+	{
+		mainPage = new Issue99999(); // My issue number here
+	}
+}
+```
+
+That file is not tracked by git, so it won't be committed by mistake.
+
 ## Adding a Test to Interact with the Reproduction
 
 Next you will need to create the appium test in the `Controls.TestCases.Shared.Tests` project, which is a library project that runs NUnit tests via Appium. Add a new class with the same name as the Reproduction within this folder: `src/Controls/tests/TestCases.Shared.Tests/Tests/Issues`. Have the class derive from `_IssuesUITest` and add your test(s) as methods.

eng/Publishing.props

@@ -1,21 +1,21 @@
 <Project>
-   <PropertyGroup>
-      <PublishingVersion>3</PublishingVersion>
-      <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-      <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishBlobItems</PublishDependsOnTargets>
-   </PropertyGroup>
+  <PropertyGroup>
+    <PublishingVersion>3</PublishingVersion>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
+  </PropertyGroup>
 
-   <ItemGroup>
-    <_InstallerManifestFilesToPublish Include="$(ArtifactsShippingPackagesDir)\**\*.zip" />
+  <ItemGroup>
+    <_InstallersToPublish Include="$(ArtifactsShippingPackagesDir)\**\*.zip" />
   </ItemGroup>
 
-   <Target Name="_PublishBlobItems">
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_InstallerManifestFilesToPublish)">
-        <IsShipping>true</IsShipping>
-        <PublishFlatContainer>true</PublishFlatContainer>
-        <RelativeBlobPath>$(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-  </Target>
+  <PropertyGroup>
+    <_UploadPathRoot>maui-sdk</_UploadPathRoot>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Artifact Include="@(_InstallersToPublish)" Kind="Blob" RelativeBlobPath="@(_UploadPathRoot)/%(Filename)%(Extension)">
+      <IsShipping>true</IsShipping>
+      <IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
+    </Artifact>
+  </ItemGroup>
 </Project>

eng/Signing.props

@@ -19,10 +19,10 @@
     <FileSignInfo Include="ExCSS.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
 
-    <FileSignInfo Include="OpenSans-Regular.ttf" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="OpenSans-Semibold.ttf" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="FluentSystemIcons-Regular.ttf" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="SegoeUI-Semibold.ttf" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="OpenSans-Regular.ttf" CertificateName="3PartyScriptsSHA2" />
+    <FileSignInfo Include="OpenSans-Semibold.ttf" CertificateName="3PartyScriptsSHA2" />
+    <FileSignInfo Include="FluentSystemIcons-Regular.ttf" CertificateName="3PartyScriptsSHA2" />
+    <FileSignInfo Include="SegoeUI-Semibold.ttf" CertificateName="3PartyScriptsSHA2" />
 
   </ItemGroup>
 

eng/Version.Details.xml

@@ -149,37 +149,37 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25161.4">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
+      <Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -134,13 +134,13 @@
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
     <SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetHelixSdkPackageVersion>
     <MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
-    <MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetRemoteExecutorPackageVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetRemoteExecutorPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>

eng/common/tools.ps1

@@ -42,7 +42,7 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+    $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
     Retry({
       Write-Host "GET $uri"

eng/common/tools.sh

@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
 
   if [[ ! -a "$install_script" ]]; then
     mkdir -p "$root"

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

@@ -11,6 +11,18 @@ steps:
   fetchDepth: 1
   clean: true
 
+- template: /eng/pipelines/common/provision.yml@self
+  parameters:
+    checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+    skipJdk: false
+    skipAndroidCommonSdks: false
+    skipAndroidPlatformApis: false
+    onlyAndroidPlatformDefaultApis: true
+    skipAndroidEmulatorImages: true
+    skipAndroidCreateAvds: true
+    skipProvisioning: true
+    skipXcode: true
+
 - script: |
     sudo xcode-select -s /Applications/Xcode_$(REQUIRED_XCODE).app
     xcrun xcode-select --print-path

eng/pipelines/arcade/stage-pack.yml

@@ -1,5 +1,11 @@
 # Template for build + pack on dnceng
 parameters:
+- name: prepareSteps
+  type: stepList
+  default: []
+- name: postSteps
+  type: stepList
+  default: []
 - name: pool
   type: object
 - name: enableSourceBuild
@@ -44,7 +50,12 @@ stages:
         - checkout: self
           fetchDepth: 1
           clean: true
-        steps:            
+
+        steps:
+        - ${{ each step in parameters.prepareSteps }}:
+          - ${{ each pair in step }}:
+              ${{ pair.key }}: ${{ pair.value }}         
+
         - script: $(_buildScript)
                   -restore -build
                   -configuration $(_BuildConfig)
@@ -70,11 +81,10 @@ stages:
           - script: $(_buildScript)
                     -restore -pack
                     -sign $(_SignArgs)
-                    -publish $(_PublishArgs)
                     -configuration $(_BuildConfig)
                     /bl:$(Build.Arcade.LogsPath)pack.binlog
                     $(_OfficialBuildIdArgs)
-            displayName: Pack, Sign & Publish
+            displayName: Pack, Sign
 
           # only for workloads
           - script: $(_buildScript)
@@ -85,10 +95,4 @@ stages:
               /bl:$(Build.Arcade.LogsPath)/build-workloads.binlog
               -projects src/Workload/workloads.csproj
               $(_OfficialBuildIdArgs)
-            displayName: Build Workloads
-
-          - task: 1ES.PublishPipelineArtifact@1
-            displayName: Publish VSDrop MSIs
-            inputs:
-              targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
-              artifactName: VSDropInsertion
+            displayName: Build Workloads, Sign & Publish

eng/pipelines/azure-pipelines-internal.yml

@@ -2,7 +2,6 @@ trigger:
   branches:
     include:
     - main
-    - net9.0
     - net10.0
     - release/*
   tags:
@@ -27,7 +26,6 @@ schedules:
   branches:
     include:
     - main
-    - net9.0
     - net10.0
 
 variables:
@@ -75,14 +73,27 @@ extends:
       suppression:
         suppressionFile: $(Build.SourcesDirectory)\eng\automation\guardian\source.gdnsuppress
     stages:
+
     - template: /eng/pipelines/arcade/stage-pack.yml@self
       parameters:
         pool: ${{ parameters.VM_IMAGE_HOST }}
-        enableSourceIndex: true
+        enableSourceIndex: false
         runAsPublic: false
         sourceIndexParams:
           sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
           binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
+        prepareSteps:
+          - template: /eng/pipelines/common/provision.yml@self
+            parameters:
+              checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+              skipJdk: false
+              skipAndroidCommonSdks: false
+              skipAndroidPlatformApis: false
+              onlyAndroidPlatformDefaultApis: true
+              skipAndroidEmulatorImages: true
+              skipAndroidCreateAvds: true
+              skipProvisioning: true
+              skipXcode: true
 
       # Publish and validation steps. Only run in official builds
     - template: /eng/common/templates-official/post-build/post-build.yml@self

eng/pipelines/azure-pipelines-public.yml

@@ -43,8 +43,8 @@ parameters:
   - name: VM_IMAGE_HOST
     type: object
     default:
-      name: Azure Pipelines
-      vmImage: $(HostedWindowsImage)
+      name: NetCore-Public
+      image: 1es-windows-2022
       os: windows
 
 stages:
@@ -53,6 +53,18 @@ stages:
   parameters:
     pool: ${{ parameters.VM_IMAGE_HOST }}
     runAsPublic: true
+    prepareSteps:
+      - template: /eng/pipelines/common/provision.yml@self
+        parameters:
+          checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+          skipJdk: false
+          skipAndroidCommonSdks: false
+          skipAndroidPlatformApis: false
+          onlyAndroidPlatformDefaultApis: true
+          skipAndroidEmulatorImages: true
+          skipAndroidCreateAvds: true
+          skipProvisioning: true
+          skipXcode: true
 
 - template: /eng/pipelines/arcade/stage-unit-tests.yml@self
   parameters:

eng/pipelines/common/device-tests-steps.yml

@@ -44,7 +44,7 @@ steps:
       displayName: Enable KVM
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))      
 
-  # Provision the variaous SDKs that are needed
+  # Provision the various SDKs that are needed
   - template: provision.yml
     parameters:
       skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}

eng/pipelines/common/provision.yml

@@ -36,13 +36,14 @@ steps:
   ##################################################
 
   # Provisioning macOS - Agent cleanser
-  - template: agent-cleanser/v1.yml@yaml-templates
-    parameters:
-      condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
-      UninstallMono: false
-      UninstallXamarinMac: true
-      CleanseAgentToolsDotNet: true
-      SelfHealPowerShell: false
+  - ${{ if ne(parameters.skipProvisionator, true) }}:
+    - template: agent-cleanser/v1.yml@yaml-templates
+      parameters:
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+        UninstallMono: false
+        UninstallXamarinMac: true
+        CleanseAgentToolsDotNet: true
+        SelfHealPowerShell: false
 
   # Provisioning macOS - Xcode
   - ${{ if ne(parameters.skipXcode, 'true') }}: