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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sample/Sample/Sample.csproj
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;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Sample</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down
4 changes: 2 additions & 2 deletions src/Acr.UserDialogs/Acr.UserDialogs.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks>net9.0;net9.0-ios;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
<AssemblyName>MailClient.Acr.UserDialogs</AssemblyName>
<PackageId>MailClient.Acr.UserDialogs</PackageId>
<PackageProjectUrl>https://github.com/emclient/userdialogs</PackageProjectUrl>
Expand Down Expand Up @@ -41,7 +41,7 @@

<ItemGroup Condition=" $(TargetFramework.Contains('android')) ">
<Compile Include="Platforms\Android\**\*.cs" />
<PackageReference Include="AndHUD" Version="2.0.1" />
<PackageReference Include="AndHUD" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
Loading