NR: Migrate to MAUI 9 / .NET 9 (#64)

* NR: Migrate to MAUI 9 / .NET 9 * Build: Set Xcode to 16.1 * Build: Set Xcode to 16.2 * Revert "Build: Set Xcode to 16.2" This reverts commit 4f8359a.
jbe2277 · Dec 28, 2024 · 4838ef4 · 4838ef4
1 parent cc69e8a
commit 4838ef4
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
@@ -22,15 +22,15 @@ jobs:
     - name: ⚙️ Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8'
+        dotnet-version: '9'
 
     - name: ⚙️ Install .NET MAUI
       run: dotnet workload install maui android
 
     - name: 🛠️ Build
       run: |
         cd src/NewsReader/NewsReader.MauiSystem
-        dotnet publish -f:net8.0-android -c:Release -p:ApplicationVersion=${{ needs.GetVersion.outputs.versionCode }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+        dotnet publish -f:net9.0-android -c:Release -p:ApplicationVersion=${{ needs.GetVersion.outputs.versionCode }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
     
     - name: 📦 Upload AAB, APK
       uses: actions/upload-artifact@v4
@@ -51,7 +51,7 @@ jobs:
     - name: ⚙️ Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8'
+        dotnet-version: '9'
 
     - name: ⚙️ Install .NET MAUI
       run: dotnet workload install maui
@@ -60,7 +60,7 @@ jobs:
       # -p:ApplicationVersion=0 because of https://github.com/dotnet/maui/issues/18571
       run: |
         cd src/NewsReader/NewsReader.MauiSystem
-        dotnet publish -f:net8.0-windows10.0.19041.0 -c:Release -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationVersion=0
+        dotnet publish -f:net9.0-windows10.0.19041.0 -c:Release -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationVersion=0
 
   iOS:
     runs-on: macos-14
@@ -71,22 +71,22 @@ jobs:
 
       - name: ⚙️ Set Xcode version
         run: |
-          XCODE_ROOT=/Applications/Xcode_15.4.app
+          XCODE_ROOT=/Applications/Xcode_16.1.app
           echo "MD_APPLE_SDK_ROOT=$XCODE_ROOT" >> $GITHUB_ENV       # set environment variable to specify Xcode for Mono and Xamarin
           sudo xcode-select -s $XCODE_ROOT
       
       - name: ⚙️ Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8'
+          dotnet-version: '9'
 
       - name: ⚙️ Install .NET MAUI
         run: dotnet workload install maui ios
 
       - name: 🛠️ Build
         run: |
           cd src/NewsReader/NewsReader.MauiSystem
-          dotnet build -f net8.0-ios -c:Release /p:packageApp=false /p:buildForSimulator=true /p:ArchiveOnBuild=false -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+          dotnet build -f net9.0-ios -c:Release /p:packageApp=false /p:buildForSimulator=true /p:ArchiveOnBuild=false -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
         
   Test:
     runs-on: windows-2022

diff --git a/src/NewsReader/Directory.Build.props b/src/NewsReader/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <MauiVersion>8.0.93</MauiVersion>
+    <MauiVersion>9.0.21</MauiVersion>
 
     <NeutralLanguage>en</NeutralLanguage>
     <Nullable>enable</Nullable>

diff --git a/src/NewsReader/NewsReader.Applications.Test/NewsReader.Applications.Test.csproj b/src/NewsReader/NewsReader.Applications.Test/NewsReader.Applications.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Test.NewsReader.Applications</RootNamespace>
     <AssemblyName>Test.NewsReader.Applications</AssemblyName>
   </PropertyGroup>

diff --git a/src/NewsReader/NewsReader.Applications/NewsReader.Applications.csproj b/src/NewsReader/NewsReader.Applications/NewsReader.Applications.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Waf.NewsReader.Applications</RootNamespace>
     <AssemblyName>Waf.NewsReader.Applications</AssemblyName>
   </PropertyGroup>

diff --git a/src/NewsReader/NewsReader.Domain.Test/NewsReader.Domain.Test.csproj b/src/NewsReader/NewsReader.Domain.Test/NewsReader.Domain.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Test.NewsReader.Domain</RootNamespace>
     <AssemblyName>Test.NewsReader.Domain</AssemblyName>
   </PropertyGroup>

diff --git a/src/NewsReader/NewsReader.Domain/NewsReader.Domain.csproj b/src/NewsReader/NewsReader.Domain/NewsReader.Domain.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Waf.NewsReader.Domain</RootNamespace>
     <AssemblyName>Waf.NewsReader.Domain</AssemblyName>
   </PropertyGroup>

diff --git a/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj b/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Waf.NewsReader.MauiSystem</RootNamespace>
     <UseMaui>true</UseMaui>
@@ -18,7 +18,7 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
 
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
   </ItemGroup>

diff --git a/src/NewsReader/NewsReader.Presentation.Test/NewsReader.Presentation.Test.csproj b/src/NewsReader/NewsReader.Presentation.Test/NewsReader.Presentation.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Test.NewsReader.Presentation</RootNamespace>
     <AssemblyName>Test.NewsReader.Presentation</AssemblyName>
   </PropertyGroup>

diff --git a/src/NewsReader/NewsReader.Presentation/NewsReader.Presentation.csproj b/src/NewsReader/NewsReader.Presentation/NewsReader.Presentation.csproj
@@ -1,25 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net9.0-android;net9.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
     <RootNamespace>Waf.NewsReader.Presentation</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
 
     <PackageReference Include="Microsoft.Graph" Version="5.67.0" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.2" />
-    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>