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.

Sign up for GitHub

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

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

Merged
merged 4 commits into from
Dec 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9cc0d9
NR: Migrate to MAUI 9 / .NET 9
jbe2277 Dec 27, 2024
7041a4b
Build: Set Xcode to 16.1
jbe2277 Dec 27, 2024
4f8359a
Build: Set Xcode to 16.2
jbe2277 Dec 27, 2024
9ddacfa
Revert "Build: Set Xcode to 16.2"
jbe2277 Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/NewsReader.CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<MauiVersion>8.0.93</MauiVersion>
<MauiVersion>9.0.21</MauiVersion>

<NeutralLanguage>en</NeutralLanguage>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/NewsReader.Applications.Test/NewsReader.Applications.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/NewsReader.Applications/NewsReader.Applications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/NewsReader.Domain.Test/NewsReader.Domain.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/NewsReader.Domain/NewsReader.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
7 changes: 3 additions & 4 deletions src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NewsReader/NewsReader.Presentation.Test/NewsReader.Presentation.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
9 changes: 4 additions & 5 deletions src/NewsReader/NewsReader.Presentation/NewsReader.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading