Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for TFM override in MAUI #523

Merged
merged 2 commits into from
Sep 22, 2023
Merged

Add support for TFM override in MAUI #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5ece0
Add support for TFM override in MAUI
dotMorten Sep 22, 2023
273fb57
Fix indent
dotMorten Sep 22, 2023
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
9 changes: 5 additions & 4 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
<DotNetTargetFramework>net472</DotNetTargetFramework>
<UWPTargetFramework>uap10.0.$(WindowsSDKTargetBuild)</UWPTargetFramework>
<NetWindowsTargetFramework Condition="'$(NetWindowsTargetFramework)'==''">net6.0-windows10.0.$(WindowsSDKTargetBuild).0</NetWindowsTargetFramework>
<NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">net7.0-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
<NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">net7.0-android33.0</NetAndroidTargetFramework>
<NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">net7.0-maccatalyst16.1</NetCatalystTargetFramework>
<NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">net7.0-ios16.1</NetiOSTargetFramework>
<NETMauiTarget Condition="'$(NETMauiTarget)'==''">net7.0</NETMauiTarget>
<NetMauiWindowsTargetFramework Condition="'$(NetMauiWindowsTargetFramework)'==''">$(NETMauiTarget)-windows10.0.$(WindowsSDKTargetBuild).0</NetMauiWindowsTargetFramework>
<NetAndroidTargetFramework Condition="'$(NetAndroidTargetFramework)'==''">$(NETMauiTarget)-android33.0</NetAndroidTargetFramework>
<NetCatalystTargetFramework Condition="'$(NetCatalystTargetFramework)'==''">$(NETMauiTarget)-maccatalyst16.1</NetCatalystTargetFramework>
<NetiOSTargetFramework Condition="'$(NetiOSTargetFramework)'==''">$(NETMauiTarget)-ios16.1</NetiOSTargetFramework>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>

<!--Output paths-->
Expand Down
2 changes: 1 addition & 1 deletion src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
<TargetFrameworks>$(NETMauiTarget);$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
<Description>ArcGIS Maps SDK for .NET controls and utilities for .NET MAUI apps including .NET for Android, .NET for iOS, .NET for macOS, or Windows UI 3 (WinUI 3)</Description>
<PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D WinUI Android iOS Mac Catalyst MacCatalyst Windows UI 3 toolkit</PackageTags>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetMauiWindowsTargetFramework)</TargetFrameworks>
Expand Down
Loading