Merge remote-tracking branch 'refs/remotes/origin/main' into lytico/g…

…tk-ongoing # Conflicts: # Directory.Build.props # Microsoft.Maui.sln # eng/Versions.props
lytico · May 16, 2024 · c1313c8 · c1313c8
2 parents 12adfbd + 86c60b3
commit c1313c8
Show file tree

Hide file tree

Showing 813 changed files with 16,342 additions and 5,056 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -21,7 +21,7 @@
  ]
  },
  "microsoft.dotnet.xharness.cli": {
- "version": "9.0.0-prerelease.24224.1",
+ "version": "9.0.0-prerelease.24263.1",
  "commands": [
  "xharness"
  ]

diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md
@@ -89,7 +89,6 @@ Use ‘main’ for bug fixes that don’t require API changes. For new features
 │ ├── samples
 │ │ ├── Maui.Controls.Sample
 │ │ ├── Maui.Controls.Sample.Sandbox
-│ │ ├── Controls.Sample.UITests
 ├── Essentials 
 │ ├── samples
 │ │ ├── Essentials.Sample
@@ -101,7 +100,6 @@ Use ‘main’ for bug fixes that don’t require API changes. For new features
 
 - *Maui.Controls.Sample*: Full gallery sample with all of the controls and features of .NET MAUI
 - *Maui.Controls.Sample.Sandbox*: Empty project useful for testing reproductions or use cases
-- *Contols.Sample.UITests*: Sample used for the automated UI tests
 - *Essentials.Sample*: Full gallery demonstrating the library previously known as essentials. These are all the non UI related MAUI APIs.
 
 ### Device Test Projects
@@ -138,10 +136,23 @@ These are tests used for exercising the UI through accessibility layers to simul
 
 ```
 ├── Controls
-│ ├── samples
-│ │ ├── Controls.Sample.UITests
 │ ├── tests
-│ │ ├── Controls.AppiumTests
+│ ├── ├── Controls.TestCases.App
+│ │ ├── Controls.TestCases.Shared.Tests
+```
+
+- *Controls.TestCases.App*: .NET MAUI Sample used for the automated UI tests
+- *Controls.TestCases.Shared.Tests*: .NET MAUI library used to define the UI tests
+
+Each platform has a specific UI tests library project where it is possible to add specific tests per platform.
+
+```
+├── Controls
+│ ├── tests
+│ │ ├── Controls.TestCases.Android.Tests
+│ │ ├── Controls.TestCases.iOS.Tests
+│ │ ├── Controls.TestCases.Mac.Tests
+│ │ ├── Controls.TestCases.WinUI.Tests
 ```
 
 ### Unit Test Projects

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -48,6 +48,7 @@ body:
  - 9.0.0-preview.3.10457
  - 9.0.0-preview.2.10293
  - 9.0.0-preview.1.9973
+ - 8.0.40 SR5
  - 8.0.21 SR4.1
  - 8.0.20 SR4
  - 8.0.14 SR3.1
@@ -118,6 +119,7 @@ body:
  - 8.0.14 SR3.1
  - 8.0.20 SR4
  - 8.0.21 SR4.1
+ - 8.0.40 SR5
  - 9.0.0-preview.1.9973
  - 9.0.0-preview.2.10293
  - 9.0.0-preview.3.10457

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -61,4 +61,4 @@ updates:
  labels:
  - "nuget"
  - "dependencies"
- - "area/upstream"
+ - "area-infrastructure"
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -236,7 +236,7 @@ configuration:
  isRegex: False
  then:
  - addLabel:
- label: "area/infrastructure \U0001F3D7️"
+ label: "area-infrastructure"
  description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
  - if:
  - payloadType: Pull_Request
@@ -286,112 +286,6 @@ configuration:
 
  This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
  description: Add comment when 's/needs-repro' is applied to issue
- - if:
- - payloadType: Issues
- - or:
- - labelAdded:
- label: control-newcontrol
- - labelAdded:
- label: control-general
- - labelAdded:
- label: control-webview
- - labelAdded:
- label: control-datetimepicker
- - labelAdded:
- label: control-picker
- - labelAdded:
- label: control-switch
- - labelAdded:
- label: control-dualscreen
- - labelAdded:
- label: control-checkbox
- - labelAdded:
- label: control-border
- - labelAdded:
- label: control-label
- - labelAdded:
- label: control-button
- - labelAdded:
- label: control-dialogalert
- - labelAdded:
- label: control-entry
- - labelAdded:
- label: control-frame
- - labelAdded:
- label: control-stepper
- - labelAdded:
- label: control-refreshview
- - labelAdded:
- label: control-image
- - labelAdded:
- label: control-activityindicator
- - labelAdded:
- label: control-radiobutton
- - labelAdded:
- label: control-slider
- - labelAdded:
- label: control-progressbar
- - labelAdded:
- label: control-pages
- - labelAdded:
- label: control-map
- then:
- - addLabel:
- label: "area/controls \U0001F3AE"
- description: Add area/controls label when any 'control-X' label is applied to the issue
- - if:
- - payloadType: Pull_Request
- - or:
- - labelAdded:
- label: control-newcontrol
- - labelAdded:
- label: control-general
- - labelAdded:
- label: control-webview
- - labelAdded:
- label: control-datetimepicker
- - labelAdded:
- label: control-picker
- - labelAdded:
- label: control-switch
- - labelAdded:
- label: control-dualscreen
- - labelAdded:
- label: control-checkbox
- - labelAdded:
- label: control-border
- - labelAdded:
- label: control-label
- - labelAdded:
- label: control-button
- - labelAdded:
- label: control-dialogalert
- - labelAdded:
- label: control-entry
- - labelAdded:
- label: control-frame
- - labelAdded:
- label: control-stepper
- - labelAdded:
- label: control-refreshview
- - labelAdded:
- label: control-image
- - labelAdded:
- label: control-activityindicator
- - labelAdded:
- label: control-radiobutton
- - labelAdded:
- label: control-slider
- - labelAdded:
- label: control-progressbar
- - labelAdded:
- label: control-pages
- - labelAdded:
- label: control-map
- then:
- - addLabel:
- label: "area/controls \U0001F3AE"
- description: Add area/controls label when any 'control-X' label is applied to the PR
  - if:
  - payloadType: Issues
  - isAction:

diff --git a/.github/workflows/dotnet-format-daily-main.yml b/.github/workflows/dotnet-format-daily-main.yml
@@ -42,7 +42,7 @@ jobs:
  author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  labels: |
  t/housekeeping ♻︎
- area/infrastructure 🏗️
+ area-infrastructure
  assignees: rmarinho, jsuarezruiz
  reviewers: rmarinho, jsuarezruiz
  branch: housekeeping/fix-codeformatting

diff --git a/.github/workflows/similarIssues.yml b/.github/workflows/similarIssues.yml
@@ -0,0 +1,38 @@
+name: GitGudSimilarIssues comments
+
+on:
+ issues:
+ types: [opened]
+ issue_comment:
+ types: [created]
+
+jobs:
+ getSimilarIssues:
+ runs-on: ubuntu-latest
+ if: >-
+ (github.event_name == 'issues' && github.event.action == 'opened') ||
+ (github.event_name == 'issue_comment' && github.event.action == 'created' && startsWith(github.event.comment.body, '/similarissues'))
+ outputs:
+ message: ${{ steps.getBody.outputs.message }}
+ steps:
+ - id: getBody
+ uses: craigloewen-msft/GitGudSimilarIssues@main
+ with:
+ issueTitle: ${{ github.event.issue.title }}
+ issueBody: ${{ github.event.issue.body }}
+ repo: ${{ github.repository }}
+ similaritytolerance: "0.70"
+ add-comment:
+ needs: getSimilarIssues
+ runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ if: needs.getSimilarIssues.outputs.message != ''
+ steps:
+ - name: Add comment
+ run: gh issue comment "$NUMBER" --repo "$REPO" --body "$BODY"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ NUMBER: ${{ github.event.issue.number }}
+ REPO: ${{ github.repository }}
+ BODY: ${{ needs.getSimilarIssues.outputs.message }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,40 @@
 <Project>
- <Import Project="eng\Versions.props"/>
+ <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+ <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props" />
+
+ <PropertyGroup>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DebugType>portable</DebugType>
+ <DebugSymbols>true</DebugSymbols>
+ <LangVersion>Latest</LangVersion>
+ <IsShipping>true</IsShipping>
+ <SignAssembly>false</SignAssembly>
+ <MauiRootDirectory>$(MSBuildThisFileDirectory)</MauiRootDirectory>
+ <MauiSrcDirectory>$(MSBuildThisFileDirectory)src/</MauiSrcDirectory>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- NuGet package information -->
+ <Copyright>$(CopyrightNetFoundation)</Copyright>
+ <Company>Microsoft</Company>
+ <Product>Microsoft .NET MAUI</Product>
+ <PackageLicenseExpression>MIT</PackageLicenseExpression>
+ <Authors>Microsoft</Authors>
+ <NeutralLanguage>en</NeutralLanguage>
+ <RepositoryUrl>https://github.com/dotnet/maui.git</RepositoryUrl>
+ <RepositoryType>git</RepositoryType>
+ <PackageProjectUrl>https://github.com/dotnet/maui</PackageProjectUrl>
+ <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+ <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+ <PackageOutputPath>$(MauiRootDirectory)artifacts</PackageOutputPath>
+ <LicenseFile>$(MauiRootDirectory)LICENSE.TXT</LicenseFile>
+ <PackageIconFullPath>$(MauiRootDirectory)Assets\icon.png</PackageIconFullPath>
+ <PackageThirdPartyNoticesFile>$(MauiRootDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
+ <DefaultPackageTags>dotnet-maui;dotnet;maui;cross-platform;ios;android;macos;maccatalyst;windows;winui;tizen</DefaultPackageTags>
+ <PublishRepositoryUrl>true</PublishRepositoryUrl>
+ <EmbedUntrackedSources>true</EmbedUntrackedSources>
+ <IncludeSymbols>true</IncludeSymbols>
+ </PropertyGroup>
 
  <PropertyGroup>
  <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">8</_MauiDotNetVersionMajor>
@@ -100,7 +135,7 @@
  <GtkTargetFrameworkVersion>3.24.24.95</GtkTargetFrameworkVersion>
  </PropertyGroup>
 
- <Import Condition="Exists('Directory.Build.Override.props')" Project="Directory.Build.Override.props"/>
+ <Import Condition="Exists('Directory.Build.Override.props')" Project="Directory.Build.Override.props" />
 
  <PropertyGroup>
  <!-- the real TFMs -->
@@ -134,8 +169,6 @@
  </PropertyGroup>
 
  <PropertyGroup>
- <MauiRootDirectory>$(MSBuildThisFileDirectory)</MauiRootDirectory>
- <MauiSrcDirectory>$(MSBuildThisFileDirectory)src/</MauiSrcDirectory>
  <DotNetOutputPath>$(MSBuildThisFileDirectory)bin/</DotNetOutputPath>
  <DotNetTempDirectory>$(DotNetOutputPath)temp/</DotNetTempDirectory>
  <DotNetDirectory>$(DotNetOutputPath)dotnet/</DotNetDirectory>
@@ -148,55 +181,20 @@
  <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).buildtasks\</_MauiBuildTasksLocation>
  <_MauiAOTProfileLocation>$(MauiSrcDirectory)Controls\src\Build.Tasks\nuget\buildTransitive\netstandard2.0\</_MauiAOTProfileLocation>
  <StrongNamerKeyFile>$(MauiRootDirectory)eng/microsoft.maui.controls.snk</StrongNamerKeyFile>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DebugType>portable</DebugType>
- <PublishRepositoryUrl>true</PublishRepositoryUrl>
- <EmbedUntrackedSources>true</EmbedUntrackedSources>
- <IncludeSymbols>true</IncludeSymbols>
  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
- <Company>Microsoft</Company>
- <Product>Microsoft MAUI</Product>
  <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
  <ProduceReferenceAssemblyInOutDir>True</ProduceReferenceAssemblyInOutDir>
  <Win2DWarnNoPlatform>false</Win2DWarnNoPlatform>
  </PropertyGroup>
- <PropertyGroup>
- <GitDefaultBranch>main</GitDefaultBranch>
- </PropertyGroup>
- <PropertyGroup>
- <!-- NuGet package information -->
- <PackageLicenseExpression>MIT</PackageLicenseExpression>
- <Authors>Microsoft</Authors>
- <NeutralLanguage>en</NeutralLanguage>
- <RepositoryUrl>https://github.com/dotnet/maui.git</RepositoryUrl>
- <RepositoryType>git</RepositoryType>
- <PackageProjectUrl>https://github.com/dotnet/maui</PackageProjectUrl>
- <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
- <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
- <PackageVersion>$(DotNetVersionBand)-dev</PackageVersion>
- <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts</PackageOutputPath>
- <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
- <PackageIconFile>$(MSBuildThisFileDirectory)Assets\icon.png</PackageIconFile>
- <PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
- <DefaultPackageTags>dotnet-maui;dotnet;maui;cross-platform;ios;android;macos;maccatalyst;windows;winui;tizen</DefaultPackageTags>
- <ContinuousIntegrationBuild Condition=" '$(CI)' == 'true' ">true</ContinuousIntegrationBuild>
- <NoWarn>$(NoWarn);RS0016;RS0017;CA1822;CA1805;CS0649;CS1589</NoWarn>
- </PropertyGroup>
- <!-- This target is replaced by GitInfo when restored. Allows Versions.targets to rely on it before restore. -->
- <Target Name="GitVersion"/>
- <Target Name="GitInfo"/>
- <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props"/>
- <Import Condition="'$(SampleProject)' != 'True' and '$(CI)' == 'true'" Project="$(MSBuildThisFileDirectory)eng\SourceLink.Build.props"/>
+
+ <Import Condition="'$(SampleProject)' != 'True' and '$(CI)' == 'true'" Project="$(MSBuildThisFileDirectory)eng\SourceLink.Build.props" />
  <ItemGroup Condition="'$(MSBuildVersion)' != '' AND '$(MSBuildVersion)' &lt; '16.7.0' ">
- <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0" PrivateAssets="all"/>
+ <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0" PrivateAssets="all" />
  </ItemGroup>
  <PropertyGroup>
  <!-- We don't need to be warned that we are using a preview .NET -->
  <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
  <!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
  <DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
  </PropertyGroup>
- <PropertyGroup>
-
- </PropertyGroup>
 </Project>