diff --git a/.github/workflows/dotnet-macos.yml b/.github/workflows/dotnet-macos.yml index e0a30be..afc6f36 100644 --- a/.github/workflows/dotnet-macos.yml +++ b/.github/workflows/dotnet-macos.yml @@ -15,7 +15,7 @@ env: jobs: build: - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v4 @@ -23,12 +23,12 @@ jobs: - 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 @@ -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 diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml index 459e1cf..c5a2742 100644 --- a/.github/workflows/dotnet-windows.yml +++ b/.github/workflows/dotnet-windows.yml @@ -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' }} diff --git a/Directory.Build.props b/Directory.Build.props index 0db162a..d5c43fc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net9.0 - 9.0.70 + net10.0 + 10.0.10 enable enable preview diff --git a/PJ.NavigationTrans.Maui/Platforms/Android/NavigationPage/NavigationViewFragmentTrans.cs b/PJ.NavigationTrans.Maui/Platforms/Android/NavigationPage/NavigationViewFragmentTrans.cs index 5b6d3ec..8366d6d 100644 --- a/PJ.NavigationTrans.Maui/Platforms/Android/NavigationPage/NavigationViewFragmentTrans.cs +++ b/PJ.NavigationTrans.Maui/Platforms/Android/NavigationPage/NavigationViewFragmentTrans.cs @@ -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); diff --git a/PJ.NavigationTrans.Sample/PJ.NavigationTrans.Sample.csproj b/PJ.NavigationTrans.Sample/PJ.NavigationTrans.Sample.csproj index f681dd9..92329f9 100644 --- a/PJ.NavigationTrans.Sample/PJ.NavigationTrans.Sample.csproj +++ b/PJ.NavigationTrans.Sample/PJ.NavigationTrans.Sample.csproj @@ -1,7 +1,7 @@  - net9.0-android;net9.0-ios; + net10.0-android;net10.0-ios; @@ -56,7 +56,7 @@ - +