Update to Fabulous 2.4.0

Author: TimLariviere

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "5.2.0",
+      "version": "6.2.3",
       "commands": [
         "fantomas"
       ]

.github/workflows/pull_request.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Check code formatting
       run: |
         dotnet tool restore
-        dotnet fantomas --check -r src samples templates
+        dotnet fantomas --check src samples templates
     - name: Restore
       run: dotnet restore ${SLN_FILE}
     - name: Build

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Release
 on:
   push:
-    tags: ['[0-9]+.[0-9]+.[0-9]+', '[0-9]+.[0-9]+.[0-9]+-preview.[0-9]+']
+    tags: ['[0-9]+.[0-9]+.[0-9]+', '[0-9]+.[0-9]+.[0-9]+-pre[0-9]+']
     paths-ignore: [ 'docs/**' ]
 
 permissions: write-all

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 No unreleased changes.
 
+## [2.4.0] - 2023-11-22
+
+### Changed
+- Updated to Fabulous 2.4.0
+
 ## [2.3.0] - 2023-06-30
 
 ### Changed
@@ -45,7 +50,8 @@ No unreleased changes.
 ### Changed
 - Fabulous.XamarinForms has moved from the Fabulous repository to its own repository: [https://github.com/fabulous-dev/Fabulous.XamarinForms](https://github.com/fabulous-dev/Fabulous.XamarinForms)
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.XamarinForms/compare/2.3.0...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.XamarinForms/compare/2.4.0...HEAD
+[2.4.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.4.0
 [2.3.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.3.0
 [2.2.0]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.2.0
 [2.1.4]: https://github.com/fabulous-dev/Fabulous.XamarinForms/releases/tag/2.1.4

Directory.Packages.props

@@ -5,21 +5,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Fabulous" Version="2.3.2" />
-    <PackageVersion Include="FsCheck.NUnit" Version="2.16.5" />
-    <PackageVersion Include="FSharp.Android.Resource" Version="1.0.4" />
-    <PackageVersion Include="FSharp.Core" Version="7.0.300" />
-    <PackageVersion Include="FSharp.Data" Version="6.2.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="Fabulous" Version="2.4.0" />
+    <PackageVersion Include="FsCheck.NUnit" Version="2.16.6" />
+    <PackageVersion Include="FSharp.Android.Resource" Version="1.1.1" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
+    <PackageVersion Include="FSharp.Data" Version="6.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="NUnit" Version="3.14.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Plugin.Permissions" Version="6.0.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.8.116" />
     <PackageVersion Include="Xamarin.CommunityToolkit" Version="2.0.6" />
-    <PackageVersion Include="Xamarin.Essentials" Version="1.7.6" />
-    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2578" />
-    <PackageVersion Include="Xamarin.Forms.Maps" Version="5.0.0.2578" />
+    <PackageVersion Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2622" />
+    <PackageVersion Include="Xamarin.Forms.Maps" Version="5.0.0.2622" />
     <PackageVersion Include="Xamarin.Forms.PancakeView" Version="2.3.0.759" />
     <PackageVersion Include="Xam.Plugin.Media" Version="6.0.2" />
   </ItemGroup>

Fabulous.XamarinForms.sln

@@ -48,10 +48,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Files", "_Solutio
 		README.md = README.md
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE.md = LICENSE.md
-	    .gitignore = .gitignore
-	    pull_request.yml = .github/workflows/pull_request.yml
-	    build.yml = .github/workflows/build.yml
-	    release.yml = .github/workflows/release.yml
+					.gitignore = .gitignore
+					pull_request.yml = .github/workflows/pull_request.yml
+					build.yml = .github/workflows/build.yml
+					release.yml = .github/workflows/release.yml
+		Directory.Packages.props = Directory.Packages.props
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global

src/Fabulous.XamarinForms/Attributes.fs

@@ -21,10 +21,12 @@ module AppTheme =
 [<Struct>]
 type ValueEventData<'data, 'eventArgs> =
     { Value: 'data
-      Event: 'eventArgs -> obj }
+      Event: 'eventArgs -> MsgValue }
 
 module ValueEventData =
-    let create (value: 'data) (event: 'eventArgs -> obj) = { Value = value; Event = event }
+    let create (value: 'data) (event: 'eventArgs -> 'msg) =
+        { Value = value
+          Event = event >> box >> MsgValue }
 
 /// Xamarin Forms specific attributes that can be encoded as 8 bytes
 module SmallScalars =
@@ -225,7 +227,7 @@ module Attributes =
                         // Set the new event handler
                         let handler =
                             EventHandler<'args>(fun _ args ->
-                                let r = curr.Event args
+                                let (MsgValue r) = curr.Event args
                                 Dispatcher.dispatch node r)
 
                         node.SetHandler(name, ValueSome handler)

src/Fabulous.XamarinForms/Fabulous.XamarinForms.fsproj

@@ -140,7 +140,7 @@
     -->
     <PackageReference Include="FSharp.Core" VersionOverride="7.0.0" PrivateAssets="All" />
     <PackageReference Include="Xamarin.Forms" VersionOverride="5.0.0.1874" />
-    <PackageReference Include="Fabulous" VersionOverride="[2.3.0, 2.4.0)" />
+    <PackageReference Include="Fabulous" VersionOverride="[2.4.0, 2.5.0)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/Fabulous.XamarinForms/Views/Application.fs

@@ -100,17 +100,17 @@ type ApplicationModifiers =
     /// Dispatch a message when the application starts
     [<Extension>]
     static member inline onStart(this: WidgetBuilder<'msg, #IApplication>, onStart: 'msg) =
-        this.AddScalar(Application.Start.WithValue(onStart))
+        this.AddScalar(Application.Start.WithValue(MsgValue onStart))
 
     /// Dispatch a message when the application is paused by the OS
     [<Extension>]
     static member inline onSleep(this: WidgetBuilder<'msg, #IApplication>, onSleep: 'msg) =
-        this.AddScalar(Application.Sleep.WithValue(onSleep))
+        this.AddScalar(Application.Sleep.WithValue(MsgValue onSleep))
 
     /// Dispatch a message when the application is resumed by the OS
     [<Extension>]
     static member inline onResume(this: WidgetBuilder<'msg, #IApplication>, onResume: 'msg) =
-        this.AddScalar(Application.Resume.WithValue(onResume))
+        this.AddScalar(Application.Resume.WithValue(MsgValue onResume))
 
     /// Link a ViewRef to access the direct Application instance
     [<Extension>]

src/Fabulous.XamarinForms/Views/Cells/EntryCell.fs

@@ -41,7 +41,7 @@ module EntryCellBuilders =
             WidgetBuilder<'msg, IEntryCell>(
                 EntryCell.WidgetKey,
                 EntryCell.Label.WithValue(label),
-                EntryCell.TextWithEvent.WithValue(ValueEventData.create text (fun args -> onTextChanged args.NewTextValue |> box))
+                EntryCell.TextWithEvent.WithValue(ValueEventData.create text (fun (args: TextChangedEventArgs) -> onTextChanged args.NewTextValue))
             )
 
 [<Extension>]
@@ -54,32 +54,32 @@ type EntryCellModifiers =
         this.AddScalar(EntryCell.LabelColor.WithValue(AppTheme.create light dark))
 
     /// <summary>Set the horizontal text alignment</summary>
-    /// param name="alignment">The horizontal text alignment</summary>
+    /// <param name="alignment">The horizontal text alignment</param>
     [<Extension>]
     static member inline horizontalTextAlignment(this: WidgetBuilder<'msg, #IEntryCell>, alignment: TextAlignment) =
         this.AddScalar(EntryCell.HorizontalTextAlignment.WithValue(alignment))
 
     /// <summary>Set the vertical text alignment</summary>
-    /// param name="alignment">The vertical text alignment</summary>
+    /// <param name="alignment">The vertical text alignment</param>
     [<Extension>]
     static member inline verticalTextAlignment(this: WidgetBuilder<'msg, #IEntryCell>, alignment: TextAlignment) =
         this.AddScalar(EntryCell.VerticalTextAlignment.WithValue(alignment))
 
     /// <summary>Set the keyboard</summary>
-    /// param name="keyboard">The keyboard type</summary>
+    /// <param name="keyboard">The keyboard type</param>
     [<Extension>]
     static member inline keyboard(this: WidgetBuilder<'msg, #IEntryCell>, keyboard: Keyboard) =
         this.AddScalar(EntryCell.Keyboard.WithValue(keyboard))
 
     /// <summary>Set the placeholder text</summary>
-    /// param name="placeholder">The placeholder</summary>
+    /// <param name="placeholder">The placeholder</param>
     [<Extension>]
     static member inline placeholder(this: WidgetBuilder<'msg, #IEntryCell>, placeholder: string) =
         this.AddScalar(EntryCell.Placeholder.WithValue(placeholder))
 
     [<Extension>]
     static member inline onCompleted(this: WidgetBuilder<'msg, #IEntryCell>, onCompleted: 'msg) =
-        this.AddScalar(EntryCell.OnCompleted.WithValue(onCompleted))
+        this.AddScalar(EntryCell.OnCompleted.WithValue(MsgValue onCompleted))
 
     /// <summary>Link a ViewRef to access the direct EntryCell control instance</summary>
     [<Extension>]