diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a88a162..1b10f8ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,18 +16,18 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install workloads - run: dotnet workload install -s https://api.nuget.org/v3/index.json android ios maccatalyst + run: dotnet workload restore --project src/Acr.UserDialogs/Acr.UserDialogs.csproj - name: Setup Java uses: actions/setup-java@v2 with: distribution: 'microsoft' java-version: '17' - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - name: Build - run: msbuild src/Acr.UserDialogs /p:Configuration=Release /p:PublicRelease=true /restore + run: dotnet build src/Acr.UserDialogs/Acr.UserDialogs.csproj -p:Configuration=Release -p:PublicRelease=true - name: Pack run: msbuild src/Acr.UserDialogs /p:Configuration=Release /p:PublicRelease=true /t:Pack - uses: actions/upload-artifact@master @@ -44,7 +44,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x include-prerelease: true - uses: actions/download-artifact@master with: diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj index fd190e0d..e46804cb 100644 --- a/sample/Sample/Sample.csproj +++ b/sample/Sample/Sample.csproj @@ -1,7 +1,7 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst + net9.0-android;net9.0-ios;net9.0-maccatalyst Exe Sample true diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj index 6394a112..4ea7db34 100644 --- a/src/Acr.UserDialogs/Acr.UserDialogs.csproj +++ b/src/Acr.UserDialogs/Acr.UserDialogs.csproj @@ -1,6 +1,6 @@  - net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst + net9.0;net9.0-ios;net9.0-android;net9.0-maccatalyst MailClient.Acr.UserDialogs MailClient.Acr.UserDialogs https://github.com/emclient/userdialogs @@ -41,7 +41,7 @@ - + diff --git a/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs b/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs index 4c818165..e7f0af78 100644 --- a/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs +++ b/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs @@ -9,6 +9,7 @@ public static class Utils { public static UIWindow GetTopWindow(this UIApplication app) => app .Windows + .AsEnumerable() .Reverse() .FirstOrDefault(x => x.WindowLevel == UIWindowLevel.Normal &&