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

[net8.0] Merge main to net8 #19898

Merged
merged 13 commits into from
Jan 15, 2024
Merged

[net8.0] Merge main to net8 #19898

merged 13 commits into from
Jan 15, 2024

Commits on Jan 11, 2024

  1. Fix issue 18110

    Mike Parker committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    43a9778 View commit details
    Browse the repository at this point in the history
  2. Fix SetProgressViewOffset on SwipeRefreshLayout (#19767)

    * Fix SetProgressViewOffset on SwipeRefreshLayout
    
    * - update refresh icon to a better color to trigger screen shot comparison
    
    * - remove extra code
    
    * - add better exception
    PureWeen authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3980e66 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bb7d809 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. [Windows] Show the Raw HTML for Html Label in case of error (#17470)

    * Show the Raw HTML in case of error
    
    * Try to add UITest for Broken HTML
    drasticactions authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    2d77421 View commit details
    Browse the repository at this point in the history
  2. [Catalyst] Allow setting of CancelButtonColor on SearchBar when using…

    … Mac Idiom (#19838)
    
    ### Description of Change
    
    Update to ```SearchBarExtensions``` so ```UpdateCancelButton``` sets the
    ```TintColor``` on the Cancel ```UIButton``` when using Mac idiom.
    Device test added verifying the changes for Mac Catalyst and iOS.
    
    ### Issues Fixed
    
    Fixes [#18110](#18110)
    mikeparker104 authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    d44f3c7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    15bedc4 View commit details
    Browse the repository at this point in the history
  4. iOS Keyboard Scrolling Improvements and UITests (not from fork) (#17670)

    * Squash all the iOS Keyboard Improvements
    
    * delay was enough manually, but not for tests
    
    * remove debugging
    
    * Add logic for Disconnect to be more useful
    
    * fix spacing from github merge conflict commit
    
    * accidently removed a var declaration
    
    * Improve UITests and add double scroll for LargeTitles
    
    * Add UITest for the grid star
    
    * Style changes
    
    * more style
    
    * add fixtureTeardown
    
    * only check for LargeTitles in portrait mode
    
    * Add changes for LargeTitles on iPad
    
    * remove the popover code until we get tests
    tj-devel709 authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    f0353d1 View commit details
    Browse the repository at this point in the history
  5. [ci] Bump XCode to 15.2.0 (#19836)

    * [ci] Bump XCode to 15.1.0
    
    * Go to Xcode 15.2
    
    * New xcode 15.1 doesn't support 14.5 simulators
    rmarinho authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    c4e9119 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7e2583c View commit details
    Browse the repository at this point in the history
  7. [ci] Don't install xharness globally (#19863)

    * dont install xharness globally
    
    * Fix restore
    rmarinho authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    65e950d View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Configuration menu
    Copy the full SHA
    47138cd View commit details
    Browse the repository at this point in the history
  2. [xamlg] improve error for Xamarin.Forms namespace (#19683)

    * [xamlg] improve error for Xamarin.Forms namespace
    
    Fixes: #18637
    
    Using the old namespace `http://xamarin.com/schemas/2014/forms` was
    causing a NRE:
    
        System.NullReferenceException: Object reference not set to an instance of an object.
        at Microsoft.Maui.Controls.Xaml.XmlTypeXamlExtensions.GetTypeReference[T](XmlType xmlType, IEnumerable`1 xmlnsDefinitions, String defaultAssemblyName, Func`2 refFromTypeInfo)
        at Microsoft.Maui.Controls.SourceGen.CodeBehindGenerator.GetTypeNameFromCustomNamespace(XmlType xmlType, Compilation compilation, AssemblyCaches caches)
        at Microsoft.Maui.Controls.SourceGen.CodeBehindGenerator.GetTypeName(XmlType xmlType, Compilation compilation, AssemblyCaches caches)
        at Microsoft.Maui.Controls.SourceGen.CodeBehindGenerator.TryParseXaml(SourceText text, String uid, Compilation compilation, AssemblyCaches caches, CancellationToken cancellationToken, String targetFramework, String& accessModifier, String& rootType, String& rootClrNamespace, Boolean& generateDefaultCtor, Boolean& addXamlCompilationAttribute, Boolean& hideFromIntellisense, Boolean& xamlResourceIdOnly, String& baseType, IEnumerable`1& namedFields, Exception& exception)
        at Microsoft.Maui.Controls.SourceGen.CodeBehindGenerator.GenerateXamlCodeBehind(ProjectItem projItem, Compilation compilation, SourceProductionContext context, AssemblyCaches caches)
        at Microsoft.Maui.Controls.SourceGen.CodeBehindGenerator.<>c.<Initialize>b__1_1(SourceProductionContext sourceProductionContext, ValueTuple`3 provider)
        at Microsoft.CodeAnalysis.UserFunctionExtensions.<>c__DisplayClass3_0`2.<WrapUserAction>b__0(TInput1 input1, TInput2 input2, CancellationToken token)
    
    In f939049, I inadvertently introduced this NRE, but even after fixing
    it, I would instead get:
    
        FormsNamespace.xaml.sg.cs(15,48): error CS1001: Identifier expected
    
    Due to the namespace, type, and base type all being `null` in this case,
    the generated C# is invalid.
    
    Instead of generating C# *at all*, let's emit an error message that says
    to use the correct namespace.
    
    I also provided a `Location` for the error message, so we will now know
    what file the error originated from.
    
    I attempted to write some test here, but adding an invalid file like
    this causes the XAML unit tests project to fail to build. It feels like
    we actually need to create a unit test project for the source generator
    -- as there isn't one now.
    
    * Add `[Obsolete]` to `FormsUri`
    jonathanpeppers authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    fceed19 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    155aca5 View commit details
    Browse the repository at this point in the history