Merge branch 'main' into feature/rangeslider

Author: ne0rrmatrix

.github/workflows/benchmarks.yml

@@ -56,7 +56,7 @@ jobs:
                 run: dotnet run --project ${{ env.PathToCommunityToolkitSourceGeneratorsBenchmarksCsproj }} -c Release -- -a "${{ runner.temp }}"
 
             -   name: Publish Benchmarks
-                uses: actions/upload-artifact@v5
+                uses: actions/upload-artifact@v6
                 with:
                     name: Benchmarks
                     path: |

.github/workflows/dotnet-build.yml

@@ -46,6 +46,7 @@ env:
     PathToCommunityToolkitSourceGeneratorsInternalUnitTestCsproj: 'src/CommunityToolkit.Maui.SourceGenerators.Internal.UnitTests/CommunityToolkit.Maui.SourceGenerators.Internal.UnitTests.csproj'
     PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
     CommunityToolkitLibrary_Xcode_Version: '26.1'
+    CommunityToolkitSample_Xcode_Version: '26.2'
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -67,7 +68,7 @@ jobs:
                 if: runner.os == 'macOS'
                 uses: maxim-lobanov/setup-xcode@v1
                 with:
-                    xcode-version: ${{ env.CommunityToolkitLibrary_Xcode_Version }}
+                    xcode-version: ${{ env.CommunityToolkitSample_Xcode_Version }}
 
             -   name: Install Latest .NET SDK, v${{ env.LATEST_NET_VERSION }}
                 uses: actions/setup-dotnet@v5
@@ -254,7 +255,7 @@ jobs:
                 shell: pwsh
 
             -   name: Upload Package List
-                uses: actions/upload-artifact@v5
+                uses: actions/upload-artifact@v6
                 if: ${{ runner.os == 'Windows' }}
                 with:
                     name: nuget-list
@@ -264,7 +265,7 @@ jobs:
 
             -   name: Publish Packages
                 if: ${{ runner.os == 'Windows' }}
-                uses: actions/upload-artifact@v5
+                uses: actions/upload-artifact@v6
                 with:
                     name: packages
                     path: ${{ github.workspace }}/nuget/
@@ -284,13 +285,13 @@ jobs:
                     dotnet-quality: 'ga'
 
             -   name: Download NuGet List
-                uses: actions/download-artifact@v6
+                uses: actions/download-artifact@v7
                 with:
                     name: nuget-list
                     path: ./
 
             -   name: Download Package List
-                uses: actions/download-artifact@v6
+                uses: actions/download-artifact@v7
                 with:
                     name: packages
                     path: ./packages
@@ -336,7 +337,7 @@ jobs:
                     --verbosity Information
 
             -   name: Publish Packages
-                uses: actions/upload-artifact@v5
+                uses: actions/upload-artifact@v6
                 with:
                     name: signed-packages
                     if-no-files-found: error
@@ -356,7 +357,7 @@ jobs:
                     dotnet-quality: 'ga'
 
             -   name: Download signed packages
-                uses: actions/download-artifact@v6
+                uses: actions/download-artifact@v7
                 with:
                     name: signed-packages
                     path: ./packages
@@ -384,7 +385,7 @@ jobs:
                     dotnet-quality: 'ga'
 
             -   name: Download signed packages
-                uses: actions/download-artifact@v6
+                uses: actions/download-artifact@v7
                 with:
                     name: signed-packages
                     path: ./packages

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

@@ -31,7 +31,7 @@ jobs:
           git commit -a -m 'Automated dotnet-format update'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           title: '[housekeeping] Automated PR to fix formatting errors'
           body: |

Directory.Build.props

@@ -22,7 +22,7 @@ https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitati
     <NuGetAuditMode>all</NuGetAuditMode>
 
     <!-- MAUI Specific -->
-    <MauiPackageVersion>10.0.10</MauiPackageVersion>
+    <MauiPackageVersion>10.0.20</MauiPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

@@ -57,8 +57,8 @@
     <PackageReference Include="Microsoft.Maui.Controls" Version="*" />
     <PackageReference Include="CommunityToolkit.Maui.Markup" Version="7.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.1" />
   </ItemGroup>
 
   <PropertyGroup>

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -270,6 +270,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		// Add Popups
 		services.AddTransientPopup<ApplyToDerivedTypesPopup>();
 		services.AddTransientPopup<ButtonPopup>();
+		services.AddTransientPopup<CollectionViewPopup, CollectionViewPopupViewModel>();
 		services.AddTransientPopup<ComplexPopup, ComplexPopupViewModel>();
 		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
 		services.AddTransientPopup<DynamicStyleInheritancePopup>();

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml

@@ -52,6 +52,8 @@
 
                 <Button Text="Complex Popup" Clicked="HandleComplexPopupClicked" />
 
+                <Button Text="Collection View Popup" Clicked="HandleCollectionViewPopupClicked" />
+                
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs

@@ -150,6 +150,20 @@ async void HandleSelfClosingPopupButtonClicked(object? sender, EventArgs e)
 		await this.ClosePopupAsync();
 	}
 
+	async void HandleCollectionViewPopupClicked(object? sender, EventArgs e)
+	{
+		var popupResult = await popupService.ShowPopupAsync<CollectionViewPopup, string>(
+			Navigation,
+			PopupOptions.Empty,
+			CancellationToken.None);
+
+		if (!popupResult.WasDismissedByTappingOutsideOfPopup)
+		{
+			// Display Popup Result as a Toast
+			await Toast.Make($"You selected {popupResult.Result}").Show(CancellationToken.None);
+		}
+	}
+
 	async void HandleComplexPopupClicked(object? sender, EventArgs e)
 	{
 		var complexPopupOpenedCancellationTokenSource = new CancellationTokenSource();

samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml

@@ -28,6 +28,11 @@
     <Style TargetType="VerticalStackLayout" ApplyToDerivedTypes="true">
         <Setter Property="Spacing" Value="0" />
     </Style>
+    
+    <!-- Highlights that this style will not be inherited by a popup -->
+    <Style TargetType="BoxView" ApplyToDerivedTypes="True">
+        <Setter Property="BackgroundColor" Value="Yellow" />
+    </Style>
 
     <Style TargetType="Button">
         <Setter Property="BackgroundColor" Value="{StaticResource NormalButtonBackgroundColor}" />

samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/FileSaverViewModel.cs

@@ -88,9 +88,6 @@ async Task SaveFileInstance(CancellationToken cancellationToken)
 			fileSaverResult.EnsureSuccess();
 
 			await Toast.Make($"File is saved: {fileSaverResult.FilePath}").Show(cancellationToken);
-#if IOS || MACCATALYST
-			fileSaverInstance.Dispose();
-#endif
 		}
 		catch (Exception ex)
 		{