Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/dotnet-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ env:
jobs:
build:

runs-on: macos-15
runs-on: macos-26

steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16.3'
xcode-version: '26.1'

- name: Workload install
run: dotnet workload install maui
Expand All @@ -40,7 +40,7 @@ jobs:
run: dotnet restore ${{env.SAMPLE_CSPROJ}}

- name: Build library
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net9.0-ios --no-restore
run: dotnet build ${{env.LIB_CSPROJ}} -c Release -f net10.0-ios --no-restore

- name: Build Sample app
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net9.0-ios --no-restore
run: dotnet build ${{env.SAMPLE_CSPROJ}} -c Release -f net10.0-ios --no-restore
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Get Nuget version and Name for PR
if: ${{ github.event_name == 'pull_request' }}
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<NetVersion>net9.0</NetVersion>
<MauiVersion>9.0.70</MauiVersion>
<NetVersion>net10.0</NetVersion>
<MauiVersion>10.0.10</MauiVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ namespace PJ.NavigationTrans.Platforms.Android.NavigationPage;

sealed class NavigationViewFragmentTrans : NavigationViewFragment
{
// TODO Try the OnCreateAnimator method instead.
// https://github.com/dotnet/maui/issues/21187
public override AAnimation OnCreateAnimation(int transit, bool enter, int nextAnim)
{
var navigationManager = (StackNavigationManagerTrans)UnsafeAccessorClass.GetStackNavigationManager(this);
Expand Down
4 changes: 2 additions & 2 deletions PJ.NavigationTrans.Sample/PJ.NavigationTrans.Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios;</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);net9.0-tizen</TargetFrameworks> -->
Expand Down Expand Up @@ -56,7 +56,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down