Merge branch 'main' into release/3.0

Author: TimLariviere

.config/dotnet-tools.json

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

.editorconfig

@@ -1,3 +1,4 @@
 [*.fs]
 max_line_length=160
-fsharp_space_before_lowercase_invocation = false
+fsharp_space_before_lowercase_invocation = false
+fsharp_max_dot_get_expression_width = 60

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 9.x
     - name: Restore
       run: dotnet restore ${SLN_FILE}
     - name: Build
@@ -40,7 +40,7 @@ jobs:
     - name: Pack
       run: dotnet pack ${SLN_FILE} -p:Version=${NIGHTLY_VERSION} -c ${CONFIG} --no-build --property PackageOutputPath=${PWD}/nupkgs
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Packages
         path: nupkgs/

.github/workflows/pull_request.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 9.x
     - name: Check code formatting
       run: |
         dotnet tool restore

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 9.x
     - name: Restore
       run: dotnet restore ${SLN_FILE}
     - name: Build
@@ -48,7 +48,7 @@ jobs:
     - name: Pack
       run: dotnet pack ${SLN_FILE} -p:Version=${RELEASE_VERSION} -p:PackageReleaseNotes="${{ steps.changelog_reader.outputs.changes }}" -c ${CONFIG} --no-build --property PackageOutputPath=${PWD}/nupkgs
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Packages
         path: nupkgs/

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _No unreleased changes_
 
+## [3.0.0-pre18] - 2025-01-16
+
+### Changed
+- Improve memory usage by @kerams (https://github.com/fabulous-dev/Fabulous/pull/1095)
+
 ## [3.0.0-pre17] - 2024-12-15
 
 ### Changed
@@ -206,7 +211,8 @@ _No unreleased changes_
 ### Changed
 - Fabulous.XamarinForms & Fabulous.MauiControls have been moved been out of the Fabulous repository. Find them in their own repositories: [https://github.com/fabulous-dev/Fabulous.XamarinForms](https://github.com/fabulous-dev/Fabulous.XamarinForms) / [https://github.com/fabulous-dev/Fabulous.MauiControls](https://github.com/fabulous-dev/Fabulous.MauiControls)
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous/compare/3.0.0-pre17...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous/compare/3.0.0-pre18...HEAD
+[3.0.0-pre18]: https://github.com/fabulous-dev/Fabulous/releases/tag/3.0.0-pre18
 [3.0.0-pre17]: https://github.com/fabulous-dev/Fabulous/releases/tag/3.0.0-pre17
 [3.0.0-pre16]: https://github.com/fabulous-dev/Fabulous/releases/tag/3.0.0-pre16
 [3.0.0-pre15]: https://github.com/fabulous-dev/Fabulous/releases/tag/3.0.0-pre15

Fabulous.sln

@@ -16,10 +16,11 @@ 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
+        .editorconfig = .editorconfig
 		Directory.Packages.props = Directory.Packages.props
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection

global.json

@@ -62,13 +62,9 @@ module DiffingAttributes =
 
     let rec viewInner depth counter =
         Stack() {
-            Label($"label1:{counter} {depth}")
-                .textColor("red")
-                .automationId($"label1:{depth}")
+            Label($"label1:{counter} {depth}").textColor("red").automationId($"label1:{depth}")
 
-            Label($"label2:{counter} {depth}")
-                .textColor("green")
-                .automationId($"label2:{depth}")
+            Label($"label2:{counter} {depth}").textColor("green").automationId($"label2:{depth}")
 
             Button($"btn: {depth}", IncBy 2)
 

src/Fabulous.Benchmarks/Benchmarks.fs

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>