Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[net9.0] Merge main to net9.0 #22218

Closed
wants to merge 53 commits into from
Closed

[net9.0] Merge main to net9.0 #22218

wants to merge 53 commits into from

Commits on Apr 16, 2024

  1. [X] Fix TargetType simplification bug (#21764)

    * Add unit test
    
    * Simplify TargetType=x:Type before setting resources
    simonrozsival committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    df8aa54 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. fix: Use AppContext.BaseDirectory instead of Environment.CurrentDirec…

    …tory (#21797)
    
    #21750
    ---------
    Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com>
    Co-authored-by: Jonathan Peppers <jonathan.peppers@gmail.com>
    3 people committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d6a3c50 View commit details
    Browse the repository at this point in the history
  2. Remove 2nd webview2 used to add base tag to passed html

    Mike Corsaro committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    3006205 View commit details
    Browse the repository at this point in the history
  3. Revert script to OG version

    Mike Corsaro committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    c0f393a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. [ios/catalyst] fix memory leak with CollectionView (#21850)

    Fixes: #20710
    Context: https://github.com/marco-skizza/MauiCollectionView
    
    Testing the sample above, you can see a memory leak when setting up a
    `CollectionView`'s `DataTemplate` in XAML, but it appears to work just
    fine with C#.
    
    Using `dotnet-gcdump` with a `Release` build of the app, I see:
    
    ![image](https://github.com/dotnet/maui/assets/840039/6b4b8682-2989-4108-8726-daf46da146e4)
    
    You can cause the C# version to leak, if you make the lambda an instance
    method:
    
    * jonathanpeppers/iOSMauiCollectionView@3e5fb02
    
    XAML just *happens* to use an instance method, no matter if XamlC is on/off.
    
    I was able to reproduce this in `CollectionViewTests.iOS.cs` by making the
    `CollectionView` look like a "user control" and create an instance method.
    
    There is a "cycle" that causes the problem here:
    
    * `Microsoft.Maui.Controls.Handlers.Items.VerticalCell` (note this is a `UICollectionViewCell`) ->
    * `DataTemplate` ->
    * `Func<object>` ->
    * `PageXamlLeak` (or `PageCsOk` w/ my change) ->
    * `CollectionView` ->
    * `Microsoft.Maui.Controls.Handlers.Items.VerticalCell`
    
    The solution being to make `TemplatedCell` (which is a subclass of `VerticalCell`)
    hold only a `WeakReference` to the `DataTemplate`.
    
    With this change in place, the test passes.
    
    ~~ Notes about Catalyst ~~
    
    1. The new test passes on Catalyst (with the `#if` removed), if you run it by itself
    2. If you run *all* the tests, it seems like there is a `Window` -> `Page` -> `CollectionView` that makes the test fail.
    3. This seems like it's all related to the test setup, and not a bug.
    
    It seems like what is here might be OK for now?
    
    If Catalyst leaks, it would probably leak on iOS as well and the test passes there.
    jonathanpeppers committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d3335ad View commit details
    Browse the repository at this point in the history
  2. [tests] add SourceGen.UnitTests to CI (#21889)

    Context: #21725
    
    In #21725 we noticed the source generator unit tests (for `*.xaml.g.cs`) don't run on CI.
    
    Whoops!
    jonathanpeppers committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    8e4450c View commit details
    Browse the repository at this point in the history
  3. [C] Propagate resources when reparenting (#21879)

    * [C] Propagate resources when reparenting
    
    - fixes a bug when the theme is changed while the control/page isn't
      parented. Should fix @LeDahu22 reported issue of #21744
    
    * move logic to resourcesextensions
    StephaneDelcroix committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    9fd58d7 View commit details
    Browse the repository at this point in the history
  4. [iOS] Fix crash closing Popup with WebView (#21923)

    * [iOS] Fix crash closing Popup with WebView (#21718)
    
    * Added repro sample
    
    * Fix the issue
    
    * Added UI Test
    
    * Updated csproj
    
    * More changes
    
    * Removed sample and test
    
    * More changes
    
    * Removed unnecesary changes
    
    * Added UITest
    
    * Update Issue21846.xaml.cs
    
    * Update Issue21846Modal.xaml.cs
    
    * Update Issue21846.cs
    
    ---------
    
    Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
    PureWeen and jsuarezruiz committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    94d4aa2 View commit details
    Browse the repository at this point in the history
  5. Update locker.yml (#21894)

    * Bump the Locker action version
    Refer to microsoft/vscode-github-triage-actions#210
    
    * Restrict the Locker action to dotnet org
    RussKie committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    345bb16 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6487271 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e94eec6 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    ebd35ca View commit details
    Browse the repository at this point in the history
  2. [windows] less interops in calling get_Children (#21792)

    The PR trivially attempts to decrease the number of interops, using a local variable.
    
    Contributes to #21787
    MartyIX committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    1d635bb View commit details
    Browse the repository at this point in the history
  3. [controls] fix leak in ImageSource, caused by Task that never complet…

    …es (#21928)
    
    Context: https://github.com/AdamEssenmacher/MemoryToolkit.Maui/tree/main/samples
    
    Testing the above sample, I saw some odd results in a `.gcdump`
    related to `UriImageSource` inside a `CollectionView`:
    
        AsyncTaskMethodBuilder+AsyncStateMachineBox<VoidTaskResult, Microsoft.Maui.Controls.ImageElement+<CancelOldValue>d__10>, Count: 182
            Dictionary+Entry<Int32, Task>[], Count: 182
                Dictionary<Int32, Task> [Static variable Task.s_currentActiveTasks], Count: 1
    
    It appears that we `await` a `Task` that never completes, which is:
    
    https://github.com/dotnet/maui/blob/8e4450cbc14932a6c74aeb8b7bfee9c94eca18b0/src/Controls/src/Core/ImageElement.cs#L129
    
    The `Task` also holds onto the `ImageSource` and whatever memory it
    happened to use. That would be ok if the `Task` completed.
    
    I could reproduce the problem in a test:
    
        [Fact]
        public async Task CancelCompletes()
        {
            var imageSource = new StreamImageSource
            {
                Stream = _ => Task.FromResult<Stream>(new MemoryStream())
            };
            await ((IStreamImageSource)imageSource).GetStreamAsync();
            await imageSource.Cancel(); // This should complete!
        }
    
    This non-completing `Task` can occur when changing `Image.Source`,
    which would certainly be bad while scrolling a `CollectionView`!
    
    To fix, I refactored the code slightly and had the problematic case
    return:
    
        return Task.FromResult(false);
    jonathanpeppers committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4cfdc90 View commit details
    Browse the repository at this point in the history
  4. More IndexOf() optimization (#20083)

    * Use better IndexOf where possible
    
    * apply similar performance improvement to the predicate-based IndexOf()
    
    * use built-in IndexOfChild on Android
    
    * add braces as per new editorconfig rule
    
    * use TryGetValue to avoid double lookup
    
    ---------
    
    Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
    symbiogenesis and Edward Miller committed Apr 19, 2024
    1 Configuration menu
    Copy the full SHA
    f73fcc6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b0e562e View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. [ios/catalyst] fix memory leak in gestures (#21887)

    * [ios/catalyst] fix memory leak in gestures
    
    Related: #21089
    Context: jonathanpeppers/iOSMauiCollectionView@547b7fa
    
    Doing something like this and running on iOS or Catalyst:
    
        <CollectionView.ItemTemplate>
            <DataTemplate>
                <Label Text="{Binding Name}">
                    <Label.GestureRecognizers>
                        <TapGestureRecognizer Command="{Binding BindingContext.Command}" />
                    </Label.GestureRecognizers>
                </Label>
            </DataTemplate>
        </CollectionView.ItemTemplate>
    
    Causes a memory leak.
    
    I could reproduce this in a test that is a bit more elaborate than #21089,
    showing issues for different types of gestures:
    
    * Usage of `ShouldReceiveTouch` creates a cycle:
    
      * `GesturePlatformManager` -> `UIGestureRecognizer.ShouldReceiveTouch` -> `GesturePlatformManager`
    
      * We can move `ShouldReceiveTouch` to a "proxy" class, and avoid the cycle.
    
    * `PanGestureRecognizer` has closures that cause the same cycle:
    
      * `this.PlatformView` -> `eventTracker?.PlatformView`
    
      * `panRecognizer` -> `((PanGestureRecognizer)panGestureRecognizer)`
    
      * These already had a `WeakReference` to use instead, but we could just make use of them.
    
    There *may* be a general problem with `CollectionView` in how it doesn't
    tear down `GesturePlatformManager` in the same way for children. But
    in either case, the problems above are cycles that should be broken.
    
    * Fix test on Windows
    jonathanpeppers committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    be17057 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Setup scaffolding for legacy test runner (#21423)

    * Just added a couple of tests
    
    * Focus on Android and iOS (for now)
    
    * Added legacy tests to the pipeline
    
    * More changes
    
    * More changes
    
    * Fixed build
    
    * Created ui-tests-legacy-steps.yml
    
    * More changes
    
    * More changes
    
    * Updated Appium to RC7
    
    * Update ui-tests.yml
    
    * Fixed test on Android
    
    * Fixed test
    
    * More changes
    
    * More changes
    
    * Updated snapshot
    
    * More fixes
    
    * Clean code
    
    * Run test only on iOS
    
    * Added pending constant
    
    * Fix build error
    
    * More changes
    
    * Update ControlGallery.iOS.Appium.UITests.csproj
    
    * Update ControlGallery.Shared.Appium.UITests.csproj
    
    * Trying to run only on iOS
    
    * This is the fix, I feel it
    
    * Fix merge error
    
    ---------
    
    Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
    jsuarezruiz and jfversluis committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    632080a View commit details
    Browse the repository at this point in the history
  2. [WinUI] GesturePlatformManager.Windows.cs - unused variable (#21953)

    * Code style
    
    * Remove unused line
    MartyIX committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    7ba723c View commit details
    Browse the repository at this point in the history
  3. IndexOf() stackOverflow fix (#20083) (#21965)

    * Update EnumerableExtensions.cs
    
    * Update EnumerableExtensions.cs
    kubaflo committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    86e22dd View commit details
    Browse the repository at this point in the history
  4. Add visual test for webview2 on windows

    Mike Corsaro committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    143550b View commit details
    Browse the repository at this point in the history
  5. add EnumerableTests (#21978)

    Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
    symbiogenesis and Edward Miller committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    3f9472b View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Configuration menu
    Copy the full SHA
    994117b View commit details
    Browse the repository at this point in the history
  2. Add s/triaged label for issues opened by (core) team (#22006)

    * Add s/triaged label for issues opened by (core) team
    
    Alternate approach to #21775 as that clearly didn't work. Hoping this _will_ work!
    
    From the original PR:
    
    > Adds a rule to the bot that adds the s/triaged label to an issue which is opened by the core team (someone with write permissions on the repo). A lot of times these issues are tasks and/or very cryptic to the triage team. This way, the triage team will skip these issues and we assume the issues are valid ones and/or not issues that need triage.
    
    * Update resourceManagement.yml
    jfversluis committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    17b05bc View commit details
    Browse the repository at this point in the history
  3. [Windows] Remove 2nd WebView used to add base tag when using HtmlWe…

    …bViewSource (#21892)
    
    ### Description of Change
    
    This PR removes the use of a 2nd "hidden" WebView2 that was used to
    parse and add a HTML `base` tag to the `head` tag when setting the HTML
    source of a WebView to a string.
    
    This was done by appending the `base` tag script to the start of the
    user's HTML string, which the WebView then adds into the `head` element.
    While this is technically not valid HTML, all current browsers correct
    this behavior.
    
    This is a work-around for the lack of being able to set the base URL
    when navigating to a string using WebView2
    (MicrosoftEdge/WebView2Feedback#530).
    
    As a bonus, using `HtmlWebViewSource` should now be 2x faster 😅
    
    ### Issues Fixed
    
    Fixes #21631
    PureWeen committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    440fa7f View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Configuration menu
    Copy the full SHA
    c1912df View commit details
    Browse the repository at this point in the history
  2. [iOS] Add UITest for #21806 (#21951)

    * Add UITest and use IsDescendant of ContainverVC
    
    * Add button to focus entry in the navbar
    
    * UITests working separately
    
    * Use the modal stack
    tj-devel709 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    a0abfd0 View commit details
    Browse the repository at this point in the history
  3. [ios/catalyst] fix memory leaks in ListView (#22007)

    * [ios/catalyst] fix memory leaks in ListView
    
    Fixes: #20025
    
    I could reproduce the leak here, pretty easily with changes to `MemoryTests`.
    
    `ListView` has several cycles that prevent garbage collection from
    happening:
    
    * `FormsUITableViewController` has `ListView _list`
        * `FormsUITableViewController` -> `ListView` -> `ListViewRenderer` -> `FormsUITableViewController`
    
    * `ListViewDataSource` has `UITableView _uiTableView`
        * `ListViewDataSource` -> `UITableView` -> `ListViewDataSource`
    
    * `ListViewDataSource` has `FormsUITableViewController _uiTableViewController`
        * `ListViewDataSource` -> `FormsUITableViewController` -> `UITableView` -> `ListViewDataSource`
    
    * `ListViewDataSource` has `protected ListView List`
        * `ListViewDataSource` -> `ListView` -> `ListViewRenderer` -> `FormsUITableViewController` -> `UITableView` -> `ListViewDataSource`
    
    I changed the above fields to all be `WeakReference<T>` and the leaks
    went away.
    
    * Tentative fix for Android
    
    Context: #18757
    
    * Revert "Tentative fix for Android"
    
    This reverts commit b294779.
    
    * Ignore ListView test on Android for now
    jonathanpeppers committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d92bebd View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. [UI Testing] Split mouse and touch Appium actions and added pending o…

    …nes (TouchAndHold etc) (#21305)
    
    * Split mouse and touch Appium actions
    
    * More changes
    
    * Fixes
    
    * Fix build errors
    
    * More changes
    
    * Fix build errors
    
    * More updates
    jsuarezruiz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    abada83 View commit details
    Browse the repository at this point in the history
  2. [Windows] Use correct build version check (#22013)

    * [Windows] Use correct build version check
    
    Windows 11 version isn't actually 11.*, it's 10.0.21996
    
    * Update Connectivity.uwp.cs
    Foda committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c1aabfe View commit details
    Browse the repository at this point in the history
  3. Navigate Directly to Test (#22019)

    * Navigate Directly To Test
    
    * - add additional wait for element
    PureWeen committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    218a9de View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Fix main (#22065)

    Remove duplicate Tap method
    mattleibow committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    adbc760 View commit details
    Browse the repository at this point in the history
  2. [iOS] Implemented PrefersHomeIndicatorAutoHidden, PrefersStatusBarHid…

    …den and PreferredStatusBarUpdateAnimation Platform Specifics (#20069)
    
    * iOS page specifics
    
    * Added a sample (#19970)
    
    * Code refactor
    
    * Replaced public with internal
    
    ---------
    
    Co-authored-by: dustin-wojciechowski <dustin.wojciechowski@microsoft.com>
    kubaflo and dustin-wojciechowski committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    409c620 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    70c2903 View commit details
    Browse the repository at this point in the history
  4. [iOS] Allow compat iOS buttons to resize image and to respect spacing…

    … and padding (#21759)
    
    * Fix the iOS button to resize the image, respect padding, and respect spacing
    
    * allow UITest - waiting for CI results
    
    * Allow the image to actually take up the whole space and fix issue with buttons without images or titles resizing
    
    * Add UITest screenshot
    
    * remove changes to sandbox
    
    * Added manual testing sample
    
    * More changes in the sample
    
    * Do not hide the text if it doesn't fit and resize if no title
    
    * UITests cannot share the same name
    
    ---------
    
    Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
    tj-devel709 and jsuarezruiz committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    63eb6b6 View commit details
    Browse the repository at this point in the history
  5. Fix null reference exception in KeyboardAutoManagerScroll when UIWind…

    …ow is null (#21753)
    
    * Fix null reference when window is null
    
    When using certain controls ie bottom sheets and search bars there can be a crash when the keyboard displays. Check for null & return early if it is.
    
    * set flag to false if returning
    
    * remove change on line 1
    
    * Add IsDescendant of ContainerVC
    
    * remove the extra IsKeyboardAutoScrollHandling flag
    
    * remove extra style changes
    
    * Add UITest
    
    * Use UIView AccessibilityIdentifier on UITest
    
    * Add ignore in platform and remove catch in favor of rebasing main
    
    ---------
    
    Co-authored-by: tj-devel709 <tj.devel709@gmail.com>
    Axemasta and tj-devel709 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7a37ebf View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0117681 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. [android] use Java primitive boolean for UriImageSource (#22040)

    Context: https://cs.android.com/android/platform/superproject/main/+/main:libcore/ojluni/annotations/hiddenapi/java/lang/Boolean.java;l=109?q=boolean.java
    
    Some internal APIs in MAUI were using `java.lang.Boolean` when they
    could just use `boolean` instead.
    
    Java `boolean` is a primitive type, while `java.lang.Boolean` is an
    object (that can be null). This is similar to `bool` vs `bool?` in C#,
    except Java does not have `struct`.
    
    This avoids:
    
    * JNI field lookup of `Boolean.TRUE` and `Boolean.FALSE` on startup
    
    * JNI field reads of `Boolean.TRUE` and `Boolean.FALSE` on every
      `UriImageSource` creation
    
    * Creating a C# instance of `Java.Lang.Boolean`, and the bookkeeping
      for reusing C# instances
    
    I was also going to change `ImageLoaderCallback.onComplete`, but it is
    listed as a public API.
    
    This is a small improvement, but should help all `UriImageSource` on
    Android.
    jonathanpeppers committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    48d5ebf View commit details
    Browse the repository at this point in the history
  2. Fix (#22033)

    MartyIX committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    944f085 View commit details
    Browse the repository at this point in the history
  3. fix CA1864 (#22092)

    Co-authored-by: Edward Miller <symbiogenisis@outlook.com>
    symbiogenesis and Edward Miller committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    6654fac View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. Improve error logging for failed resizetizering (#22064)

    * Improve error logging for failed resizetizering
    
    * Fix tests
    mattleibow committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    e33d176 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. [UI Testing] Implement PressEnter method (#22112)

    * Implement PressEnter method on appium
    
    * IsKeyboardShown not implemented on Windows
    
    * Updated test
    jsuarezruiz committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    8a54162 View commit details
    Browse the repository at this point in the history
  2. Fix TabbedPage title displaying incorrectly (#17039)

    * Fix TabbedPage title displaying incorrectly
    
    Presently, when a navigation page is created and a tabbed page is added to it with children, the navigation page uses the tabbed page's selected child title as its title. This behavior is unexpected when using standard tabs (tabs on the top) in a navigation page on Android.
    
    Without a custom tabbed page, this behavior makes sense, especially for bottom tabs; however, when a custom tabbed page is defined, it seems that the title should not be overridden.
    
    Fixes #8577
    
    * Add device tests
    
    * Add unit tests
    
    * Updated test
    
    * More tests
    
    * Fixed test not being able to fail
    
    * Changed GetTitle to work with more than just TabbedPages
    
    * Removed tests that deal with Child page titles replacing the Toolbar title
    
    ---------
    
    Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
    Co-authored-by: Dustin Wojciechowski <dustin.wojciechowski@microsoft.com>
    Co-authored-by: Dustin Wojciechowski <dustinwo@microsoft.com>
    4 people committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    6328b76 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Update dependencies from https://github.com/dotnet/xharness build 202…

    …40424.1 (#22119)
    
    Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
     From Version 9.0.0-prerelease.24208.1 -> To Version 9.0.0-prerelease.24224.1
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    7d9fb20 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. [Android] Crash removing item from CarouselView - fix (#22107)

    * Fix #19786
    
    * Added a Ui test (#19786)
    
    * Update MauiCarouselRecyclerView.cs
    kubaflo committed May 1, 2024
    Configuration menu
    Copy the full SHA
    05e72cf View commit details
    Browse the repository at this point in the history
  2. [iOS] Shell page title fix (#20575)

    * [iOS] Shell page title fix (#20199)
    
    * Added a UiTest (#20199)
    
    * Added pending snapshot
    
    * Shell page title fix
    
    ---------
    
    Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com>
    kubaflo and jsuarezruiz committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a2f1a89 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab80939 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Android mipmap/appicon failing with "APT2260" (#21838)

    Context https://developercommunity.visualstudio.com/t/Android-mipmapappicon-failing-with-APT/10622494
    
    Users are reporting this error quite allot. During
    a build it fails with the following error
    
    ```
     APT2260 resource mipmap/appicon (aka xxx:mipmap/appicon) not found.
    ```
    
    Further investigation this only appears to happen during a full build
    of all the platforms. Specifying `-f net8.0-android` on the build
    this does not seem to happen at all.
    
    The problem is the build gets into a weird situation where the `mauiimage.stamp` file
    is present but none of the generated images are. Considering that the
    stamp file gets generated AFTER the images its kinda difficult to see
    how this even occurs.
    
    The work around for this is to write the list of generated image files to
    `mauiimage.outputs`. We can then read this list back on subsequent builds
    and use that list for the `Outputs` of the `ResizetizeImages` target.
    This means the target will run if either the stamp file or any of the
    expected images are not present.
    dellis1972 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ff5f3f0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2fc4774 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    222ca3c View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'main' into merge-main-net90

    # Conflicts:
    #	Microsoft.Maui.sln
    #	eng/Version.Details.xml
    #	src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
    #	src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
    rmarinho committed May 6, 2024
    Configuration menu
    Copy the full SHA
    9257ab7 View commit details
    Browse the repository at this point in the history
  2. Try fix merge

    rmarinho committed May 6, 2024
    Configuration menu
    Copy the full SHA
    2e8568d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    43fee72 View commit details
    Browse the repository at this point in the history