Attempt to fix build

emclient · Dec 7, 2023 · 140f68d · 140f68d
1 parent 736006d
commit 140f68d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,6 +19,11 @@ jobs:
         dotnet-version: 7.0.x
     - name: Install workloads
       run: dotnet workload install -s https://api.nuget.org/v3/index.json android ios
+    - name: Setup Java
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'microsoft'
+        java-version: '21'
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
     - name: Build number

diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;xamarin.ios10;monoandroid90;monoandroid10.0;net7.0-ios;net7.0-android</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;xamarin.ios10;monoandroid13.0;net7.0-ios;net7.0-android</TargetFrameworks>
         <PackageProjectUrl>https://github.com/aritchie/userdialogs</PackageProjectUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <Authors>Allan Ritchie</Authors>
@@ -39,7 +39,7 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" $(TargetFramework.StartsWith('monoandroid10')) or $(TargetFramework.StartsWith('net7.0-android')) ">
+    <PropertyGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) or $(TargetFramework.StartsWith('net7.0-android')) ">
         <DefineConstants>$(DefineConstants);ANDROIDX</DefineConstants>
     </PropertyGroup>
 
@@ -57,15 +57,7 @@
         <Compile Include="Platforms\Shared\**\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid9')) ">
-        <Compile Include="Platforms\Shared\**\*.cs" />
-        <Compile Include="Platforms\Android\**\*.cs" />
-        <Reference Include="System.Drawing.Common" />
-        <PackageReference Include="AndHUD" Version="1.4.3" />
-        <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid10')) or $(TargetFramework.StartsWith('net7.0-android')) ">
+    <ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) or $(TargetFramework.StartsWith('net7.0-android')) ">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Android\**\*.cs" />
         <Reference Include="System.Drawing.Common" />