Skip to content

Commit 338f288

Browse files
clm-uniflyclm-unifly
committed
Added support for net7.0
1 parent 18b3a8f commit 338f288

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

‎src/libs/Mapbox.Maui/Mapbox.Maui.csproj‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-android;net6.0-ios;</TargetFrameworks>
4+
<TargetFrameworks>net6.0-android;net6.0-ios;net7.0-android;net7.0-ios;</TargetFrameworks>
55
<UseMaui>true</UseMaui>
66
<SingleProject>true</SingleProject>
77
<ImplicitUsings>enable</ImplicitUsings>
88

9-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
10-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
9+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.4</SupportedOSPlatformVersion>
1110
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
12-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
13-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
14-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
1511
<RootNamespace>MapboxMaui</RootNamespace>
12+
<SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
1613
</PropertyGroup>
14+
15+
<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
16+
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
17+
</PropertyGroup>
18+
1719
<!-- Android -->
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1921
<WarningLevel>4</WarningLevel>
@@ -22,21 +24,21 @@
2224
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2325
<LangVersion>latestmajor</LangVersion>
2426
</PropertyGroup>
25-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-android')) != true">
27+
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != true">
2628
<Compile Remove="**\**\*.Android.cs" />
2729
</ItemGroup>
2830

2931
<!-- Both iOS and Mac Catalyst -->
30-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true">
32+
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != true AND $(TargetFramework.Contains('-maccatalyst')) != true">
3133
<Compile Remove="**\**\*.MaciOS.cs" />
3234
<None Include="**\**\*.MaciOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
3335
</ItemGroup>
3436

3537
<!-- iOS -->
36-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) != true">
38+
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != true">
3739
<Compile Remove="**\**\*.iOS.cs" />
3840
</ItemGroup>
39-
<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) == true">
41+
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) == true">
4042
<Compile Include="**\**\*.iOS.cs" />
4143
</ItemGroup>
4244

@@ -68,10 +70,10 @@
6870

6971
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
7072
<PackageReference Include="Com.Mapbox.Maps.Android" Version="10.11.1" />
71-
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.21.1" />
73+
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.0.1" />
7274
<PackageReference Include="Square.OkHttp3" Version="4.10.0.1" />
73-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.8.21.1" />
74-
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.6.0.2" />
75+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.0.1" />
76+
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.6.0.4" />
7577
</ItemGroup>
7678

7779
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">

‎src/qs/MapboxMauiQs/MapboxMauiQs.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<SingleProject>true</SingleProject>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<IsPackable>false</IsPackable>
12-
12+
1313
<!-- Display name -->
1414
<ApplicationTitle>MapboxQs</ApplicationTitle>
1515

@@ -21,12 +21,12 @@
2121
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
2222
<ApplicationVersion>1</ApplicationVersion>
2323

24-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
25-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
24+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.4</SupportedOSPlatformVersion>
2625
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
27-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
28-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
29-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
26+
</PropertyGroup>
27+
28+
<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
29+
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
3030
</PropertyGroup>
3131

3232
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
@@ -75,10 +75,10 @@
7575

7676
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
7777
<PackageReference Include="Com.Mapbox.Maps.Android" Version="10.11.1" />
78-
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.21.1" />
78+
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.0.1" />
7979
<PackageReference Include="Square.OkHttp3" Version="4.10.0.1" />
80-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.8.21.1" />
81-
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.6.0.2" />
80+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.0.1" />
81+
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.6.0.4" />
8282
</ItemGroup>
8383
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
8484
<PackageReference Include="MapboxMapsObjC.iOS" Version="10.11.1.1" />

0 commit comments

Comments
 (0)