Merge branch 'main' into tint-navigate-bug

Author: TheCodeTraveler

.github/copilot-instructions.md

@@ -2,12 +2,12 @@
 This document provides guidelines for using GitHub Copilot to contribute to the .NET MAUI Community Toolkit. It includes instructions on setting up your environment, writing code, and following best practices specific to .NET MAUI.
 
 ## Prerequisites
-1.	Install the latest stable (.NET SDK)[https://dotnet.microsoft.com/en-us/download].
+1.	Install the latest stable [.NET SDK](https://dotnet.microsoft.com/en-us/download).
 2.	Install .NET MAUI workloads (we recommend using Visual Studio installer).
 
 ## Setting Up GitHub Copilot
 1.	Ensure you have GitHub Copilot installed and enabled in Visual Studio.
-2.	Familiarize yourself with the basic usage of GitHub Copilot by reviewing the (official documentation)[https://docs.github.com/en/copilot].
+2.	Familiarize yourself with the basic usage of GitHub Copilot by reviewing the [official documentation](https://docs.github.com/en/copilot).
 
 ## Writing Code with GitHub Copilot
 ### General Guidelines
@@ -17,15 +17,15 @@ This document provides guidelines for using GitHub Copilot to contribute to the
 ### Specific to .NET MAUI
 * Ensure that any UI components or controls are compatible with .NET MAUI.
 * Avoid using Xamarin.Forms-specific code unless there is a direct .NET MAUI equivalent.
-* Follow the project's coding style and best practices as outlined in the (contributing)[https://github.com/CommunityToolkit/Maui/blob/main/CONTRIBUTING.md] document.
+* Follow the project's coding style and best practices as outlined in the [contributing](https://github.com/CommunityToolkit/Maui/blob/main/CONTRIBUTING.md) document.
 
 ## Best Practices
 * Use **Trace.WriteLine()** for debug logging instead of **Debug.WriteLine()**.
 * Include a **CancellationToken** as a parameter for methods returning **Task** or **ValueTask**.
 * Use **is** for null checking and type checking.
 * Use file-scoped namespaces to reduce code verbosity.
 * Avoid using the **!** null forgiving operator.
-** Follow naming conventions for enums and property names.
+* Follow naming conventions for enums and property names.
 
 ### Debug Logging
 * Always use `Trace.WriteLine()` instead of `Debug.WriteLine` for debug logging because `Debug.WriteLine` is removed by the compiler in Release builds
@@ -141,7 +141,7 @@ Read and follow our [Pull Request template](https://github.com/CommunityToolkit/
 4.	Open a pull request and follow the [Pull Request template](https://github.com/CommunityToolkit/Maui/blob/main/.github/PULL_REQUEST_TEMPLATE.md).
 
 ## Additional Resources
-- (GitHub Copilot Documentation)[https://docs.github.com/en/copilot]
-- (.NET MAUI Documentation)[https://learn.microsoft.com/en-us/dotnet/maui/]
+* [GitHub Copilot Documentation](https://docs.github.com/en/copilot)
+* [.NET MAUI Documentation](https://learn.microsoft.com/en-us/dotnet/maui/)
 
-By following these guidelines, you can effectively use GitHub Copilot to contribute to the .NET MAUI Community Toolkit. Thank you for your contributions!
+By following these guidelines, you can effectively use GitHub Copilot to contribute to the .NET MAUI Community Toolkit. Thank you for your contributions!

.github/dependabot.yml

@@ -24,3 +24,7 @@ updates:
         - dependency-name: "Xamarin.AndroidX.Collection"
         - dependency-name: "Xamarin.AndroidX.Lifecycle.LiveData"
         - dependency-name: "Xamarin.AndroidX.Collection.Ktx"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"

.github/workflows/dotnet-build.yml

@@ -22,7 +22,7 @@ env:
   NugetPackageVersionCamera: '99.0.0-preview${{ github.run_number }}'
   NugetPackageVersionMediaElement: '99.0.0-preview${{ github.run_number }}'
   NugetPackageVersionMaps: '99.0.0-preview${{ github.run_number }}'
-  TOOLKIT_NET_VERSION: '9.0.202'
+  TOOLKIT_NET_VERSION: '9.0.300'
   LATEST_NET_VERSION: '9.0.x'
   PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
   PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
@@ -59,7 +59,7 @@ jobs:
         os: [windows-latest, macos-15]
     steps:
       - name: Checkout code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
       - name: Set Latest Xcode Version
         if: runner.os == 'macOS'
@@ -104,28 +104,33 @@ jobs:
         os: [windows-latest, macos-15]
     steps:
       - name: Checkout code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
       - name: Set NuGet Version to Tag Number
-        if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-mediaelement')
-        run: echo "NugetPackageVersion=${{ github.ref }}" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/') && (!endsWith(github.ref, '-mediaelement') && !endsWith(github.ref, '-camera') && !endsWith(github.ref, '-maps'))
+        run: echo "NugetPackageVersion=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        shell: bash
 
       - name: Set NuGet Version to Tag Number for Camera
         if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-camera')
-        run: echo "NugetPackageVersionCamera=${{ github.ref }}" >> $GITHUB_ENV
+        run: echo "NugetPackageVersionCamera=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        shell: bash
 
       - name: Set NuGet Version to Tag Number for MediaElement
         if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-mediaelement')
-        run: echo "NugetPackageVersionMediaElement=${{ github.ref }}" >> $GITHUB_ENV
+        run: echo "NugetPackageVersionMediaElement=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        shell: bash
 
       - name: Set NuGet Version to Tag Number for Maps
         if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-maps')
-        run: echo "NugetPackageVersionMaps=${{ github.ref }}" >> $GITHUB_ENV
+        run: echo "NugetPackageVersionMaps=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        shell: bash
 
       - name: Set NuGet Version to PR Version
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           echo "NugetPackageVersion=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
+          echo "NugetPackageVersionCamera=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
           echo "NugetPackageVersionMediaElement=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
           echo "NugetPackageVersionMaps=${{ env.CurrentSemanticVersionBase }}-build-${{ github.event.pull_request.number }}.${{ github.run_number }}+${{ github.sha }}"
         shell: bash
@@ -258,7 +263,7 @@ jobs:
 
   sign:
     needs: [build_library]
-    if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: windows-latest
     permissions:
       id-token: write # Required for requesting the JWT
@@ -281,6 +286,27 @@ jobs:
         with:
           name: packages
           path: ./packages
+      
+      - name: Remove MediaElement package if that is not being released
+        if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-mediaelement')
+        run: |
+          ${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.MediaElement" } | Remove-Item -Force
+
+      - name: Remove Camera package if that is not being released
+        if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-camera')
+        run: |
+          ${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Camera" } | Remove-Item -Force
+
+      - name: Remove Maps package if that is not being released
+        if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-maps')
+        run: |
+          ${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Maps" } | Remove-Item -Force
+
+      - name: Remove Core & Main package if that is not being released
+        if: startsWith(github.ref, 'refs/tags/') && (!endsWith(github.ref, '-mediaelement') && !endsWith(github.ref, '-camera') && !endsWith(github.ref, '-maps'))
+        run: |
+          ${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui" } | Remove-Item -Force
+          ${{ github.workspace }}/packages/**/*.nupkg | Where-Object { $_ -notmatch "CommunityToolkit.Maui.Core" } | Remove-Item -Force
 
       - name: Install Signing Tool
         run: dotnet tool install --tool-path ./tools sign --version 0.9.1-beta.23356.1
@@ -293,7 +319,7 @@ jobs:
           --file-list "${{ github.workspace }}/SignClientFileList.txt"
           --timestamp-url "http://timestamp.digicert.com"
           --publisher-name ".NET Foundation"
-          --description "Community Toolkit MAUI"
+          --description ".NET MAUI Community Toolkit"
           --description-url "https://github.com/CommunityToolkit/Maui"
           --azure-key-vault-url "${{ secrets.SIGN_KEY_VAULT_URL }}"
           --azure-key-vault-client-id ${{ secrets.SIGN_CLIENT_ID }}
@@ -311,7 +337,7 @@ jobs:
             ${{ github.workspace }}/packages/**/*.nupkg
 
   release:
-    if: ${{ startsWith(github.ref, 'refs/heads/rel/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
     needs: [sign]
     environment: nuget-release-gate # This gates this job until manually approved
     runs-on: ubuntu-latest

.github/workflows/dotnet-format-daily.yml

@@ -10,13 +10,13 @@ jobs:
         run: dotnet tool install -g dotnet-format
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
       - name: Run dotnet format
         id: format
-        uses: jfversluis/dotnet-format@v1.0.5
+        uses: jfversluis/dotnet-format@v1.0.9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           action: "fix"
@@ -31,7 +31,7 @@ jobs:
           git commit -a -m 'Automated dotnet-format update'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v7
         with:
           title: '[housekeeping] Automated PR to fix formatting errors'
           body: |

Directory.Build.props

@@ -16,7 +16,7 @@
     <NuGetAuditMode>all</NuGetAuditMode>
 
     <!-- MAUI Specific -->
-    <MauiPackageVersion>9.0.60</MauiPackageVersion>
+    <MauiPackageVersion>9.0.70</MauiPackageVersion>
     <NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
@@ -170,9 +170,11 @@
      xUnit3002: Classes which are JSON serializable should not be tested for their concrete type
      XC0045: Binding: Property not found
      XC0103: Consider attributing the markup extension with [RequireService] or [AcceptEmptyServiceProvider] if it doesn't require any
+     XC0618: Property, Property setter or BindableProperty "BackgroundColor" is deprecated
      IL2***: Trim Warnings     
      IL3***: AOT Warnings     
-     RS2007: Analyzer release file 'AnalyzerReleases.Shipped.md' has a missing or invalid release header-->
+     RS1038: Compiler extensions should be implemented in assemblies with compiler-provided references
+     RS2007: Analyzer release file 'AnalyzerReleases.Shipped.md' has a missing or invalid release header -->
     <WarningsAsErrors>
       nullable,
       CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1587,CS1589,CS1590,CS1591,CS1592,CS1598,CS1658,CS1710,CS1711,CS1712,CS1723,CS1734,
@@ -182,7 +184,7 @@
       xUnit1000,xUnit1001,xUnit1002,xUnit1003,xUnit1004,xUnit1005,xUnit1006,xUnit1007,xUnit1008,xUnit1009,xUnit1010,xUnit1011,xUnit1012,xUnit1013,xUnit1014,xUnit1015,xUnit1016,xUnit1017,xUnit1018,xUnit1019,xUnit1020,xUnit1021,xUnit1022,xUnit1023,xUnit1024,xUnit1025,xUnit1026,xUnit1027,xUnit1028,xUnit1029,xUnit1030,xUnit1031,xUnit1032,xUnit1033,xUnit1034,xUnit1035,xUnit1036,xUnit1037,xUnit1038,xUnit1039,xUnit1040,xUnit1041,xUnit1042,xUnit1043,xUnit1048,xUnit1049,xUnit1050,xUnit1051,
       xUnit2000,xUnit2001,xUnit2002,xUnit2003,xUnit2004,xUnit2005,xUnit2006,xUnit2007,xUnit2008,xUnit2009,xUnit2010,xUnit2011,xUnit2012,xUnit2013,xUnit2014,xUnit2015,xUnit2016,xUnit2017,xUnit2018,xUnit2019,xUnit2020,xUnit2021,xUnit2022,xUnit2023,xUnit2024,xUnit2025,xUnit2026,xUnit2027,xUnit2028,xUnit2029,xUnit2030,xUnit2031,xUnit2032,
       xUnit3000,xUnit3001,xUnit3002,
-      XC0045,XC0103,
+      XC0045,XC0103,XC0618,
       IL2001,IL2002,IL2003,IL2004,IL2005,IL2006,IL2007,IL2008,IL2009,
       IL2010,IL2011,IL2012,IL2013,IL2014,IL2015,IL2016,IL2017,IL2018,IL2019,
       IL2020,IL2021,IL2022,IL2023,IL2024,IL2025,IL2026,IL2027,IL2028,IL2029,
@@ -197,7 +199,7 @@
       IL2110,IL2111,IL2112,IL2113,IL2114,IL2115,IL2116,IL2117,IL2118,IL2119,
       IL2120,IL2121,IL2122,
       IL3050,IL3051,IL3052,IL3053,IL3054,IL3055,IL3056,
-      RS2007
+      RS1038,RS2007
     </WarningsAsErrors>
 
     <!--

README.md

@@ -1,6 +1,6 @@
 <img src="https://user-images.githubusercontent.com/13558917/137551073-ac8958bf-83e3-4ae3-8623-4db6dce49d02.png" alt="..NET Bot" width=125>  [<img src="https://raw.githubusercontent.com/dotnet-foundation/swag/master/logo/dotnetfoundation_v4.svg" alt=".NET Foundation" width=100>](https://dotnetfoundation.org) 
 
-[![Build Status](https://dev.azure.com/dotnet/CommunityToolkit/_apis/build/status/CommunityToolkit.Maui?branchName=main)](https://dev.azure.com/dotnet/CommunityToolkit/_build/latest?definitionId=169&branchName=main) [![NuGet Version](https://img.shields.io/nuget/vpre/CommunityToolkit.Maui)](https://www.nuget.org/packages/CommunityToolkit.Maui) [![NuGet Downloads](https://img.shields.io/nuget/dt/CommunityToolkit.Maui)](https://www.nuget.org/packages/CommunityToolkit.Maui)
+[![Build](https://github.com/CommunityToolkit/Maui/actions/workflows/dotnet-build.yml/badge.svg)](https://github.com/CommunityToolkit/Maui/actions/workflows/dotnet-build.yml) [![NuGet Downloads](https://img.shields.io/nuget/dt/CommunityToolkit.Maui)](https://www.nuget.org/packages/CommunityToolkit.Maui)
 
 # .NET MAUI Community Toolkit
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.202",
+    "version": "9.0.300",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }

samples/CommunityToolkit.Maui.Sample/App.xaml

@@ -10,42 +10,34 @@
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="{x:Type popups:ImplicitStylePopup}">
-                <Setter Property="Size" Value="100,100" />
-                <Setter Property="Color" Value="Red" />
-                <Setter Property="HorizontalOptions" Value="Start" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="100" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Red" />
             </Style>
 
             <Style x:Key="ExplicitPopupStyle" TargetType="{x:Type popups:ExplicitStylePopup}">
-                <Setter Property="Size" Value="200,100" />
-                <Setter Property="Color" Value="Yellow" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Yellow" />
             </Style>
 
             <Style x:Key="BasePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}">
-                <Setter Property="Size" Value="200,200" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="200" />
             </Style>
             <Style x:Key="InheritancePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}" BasedOn="{StaticResource BasePopupStyle}">
-                <Setter Property="Color" Value="SkyBlue" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="SkyBlue" />
             </Style>
 
             <Style x:Key="DynamicBasePopupStyle" TargetType="{x:Type popups:DynamicStyleInheritancePopup}">
-                <Setter Property="Size" Value="150,150" />
+                <Setter Property="WidthRequest" Value="150" />
+                <Setter Property="HeightRequest" Value="150" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle1" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BasedOn="{StaticResource DynamicBasePopupStyle}">
-                <Setter Property="Color" Value="Purple" />
-                <Setter Property="VerticalOptions" Value="End" />
+                <Setter Property="BackgroundColor" Value="Purple" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle2" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BaseResourceKey="DynamicInheritancePopupStyle1">
-                <Setter Property="Color" Value="Orange" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="Orange" />
             </Style>
 
         </ResourceDictionary>