Update CI/CD

fabulous-dev · Nov 14, 2024 · 97a0c3e · 97a0c3e
1 parent d4887ae
commit 97a0c3e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,11 @@ env:
   TEMPLATE_PROJ: templates/Fabulous.MauiControls.Templates.proj
   TEMPLATE_PKG: nupkgs/Fabulous.MauiControls.Templates
   NUPKG_FOLDER: nupkgs
-  XCODE_PATH: /Applications/Xcode_15.2.app/Contents/Developer
+  XCODE_PATH: /Applications/Xcode_16.0.app/Contents/Developer
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
     - name: Checkout sources
       uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
     - name: Use correct Xcode version
       run: sudo xcode-select -s ${XCODE_PATH}
     - name: Install dotnet workload

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -4,22 +4,26 @@ on: pull_request
 env:
   SLN_FILE: Fabulous.MauiControls.NoSamples.sln
   CONFIG: Release
-  XCODE_PATH: /Applications/Xcode_15.0.1.app/Contents/Developer
+  XCODE_PATH: /Applications/Xcode_16.0.app/Contents/Developer
 
 jobs:
   pull_request:
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
     - name: Checkout sources
       uses: actions/checkout@v3
-    - name: Setup .NET
+    - name: Setup .NET for Fantomas
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 8.x
     - name: Check code formatting
       run: |
         dotnet tool restore
         dotnet fantomas --check src samples templates
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 9.x
     - name: Use correct Xcode version
       run: sudo xcode-select -s ${XCODE_PATH}
     - name: Install dotnet workload

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,11 +10,11 @@ env:
   CONFIG: Release
   SLN_FILE: Fabulous.MauiControls.NoSamples.sln
   TEMPLATE_PROJ: templates/Fabulous.MauiControls.Templates.proj
-  XCODE_PATH: /Applications/Xcode_15.0.1.app/Contents/Developer
+  XCODE_PATH: /Applications/Xcode_16.0.app/Contents/Developer
 
 jobs:
   release:
-    runs-on: macos-13
+    runs-on: macos-15
     environment: nuget
     steps:
     - name: Checkout sources
@@ -40,7 +40,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.x
+        dotnet-version: 9.x
     - name: Use correct Xcode version
       run: sudo xcode-select -s ${XCODE_PATH}
     - name: Install dotnet workload

diff --git a/README.md b/README.md
@@ -25,18 +25,20 @@ let update msg model =
     | Decrement -> { model with Count = model.Count - 1 }
 
 let view model =
-    Application(
-        ContentPage(
-            VStack(spacing = 16.) {
-                Image("fabulous.png")
-
-                Label($"Count is {model.Count}")
-
-                Button("Increment", Increment)
-                Button("Decrement", Decrement)
+    Application() {
+        Window() {
+            ContentPage() {
+                VStack(spacing = 16.) {
+                    Image("fabulous.png")
+    
+                    Label($"Count is {model.Count}")
+    
+                    Button("Increment", Increment)
+                    Button("Decrement", Decrement)
+                }
             }
-        )
-    )
+        }
+    }
 ```
 
 ## Getting Started

diff --git a/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj b/src/Fabulous.MauiControls/Fabulous.MauiControls.fsproj
@@ -251,7 +251,7 @@
       This version will be used as the lower bound in the NuGet package
     -->
     <PackageReference Include="FSharp.Core" VersionOverride="9.0.100" PrivateAssets="All" />
-    <PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[3.0.0-pre9]" />
+    <PackageReference Include="Fabulous" Condition="'$(UseLocalProjectReference)' != 'true'" VersionOverride="[3.0.0-pre10]" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Maui.Controls" VersionOverride="9.0.0" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" VersionOverride="9.0.0" />

diff --git a/templates/content/blank/NewApp.fsproj b/templates/content/blank/NewApp.fsproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
     <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-    <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+    <!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
     <OutputType>Exe</OutputType>
     <RootNamespace>NewApp</RootNamespace>
     <UseMaui>true</UseMaui>