Skip to content

Commit 496e3a4

Browse files
committed
Updated packages and fixed build error
1 parent 6dd5142 commit 496e3a4

4 files changed

Lines changed: 7 additions & 11 deletions

File tree

src/Directory.Packages.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">300.0.0</ArcGISMapsSDKVersion>
4+
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">300.1.0</ArcGISMapsSDKVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
@@ -30,8 +30,7 @@
3030
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" Condition="'$(UseMaui)'!='true'" />
3131
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
3232
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha" />
33-
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
34-
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
35-
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.6" />
33+
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.51" />
34+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
3635
</ItemGroup>
3736
</Project>

src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<RootNamespace>ArcGIS.Samples</RootNamespace>
88
<UseMaui>true</UseMaui>
@@ -143,9 +143,6 @@
143143
<PackageReference Include="WinUIEx" />
144144
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
145145
</ItemGroup>
146-
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
147-
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
148-
</ItemGroup>
149146
<ItemGroup>
150147
<MauiXaml Update="Views\*.xaml">
151148
<Generator>MSBuild:Compile</Generator>

src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgisruntime.samples.maui" android:versionCode="9" android:versionName="300.0.0">
33
<application android:allowBackup="true" android:usesCleartextTraffic="true" android:icon="@mipmap/appiconandroid" android:roundIcon="@mipmap/appiconandroid_round" android:supportsRtl="true" android:label="ArcGIS Maps .NET MAUI Samples"></application>
4-
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35" />
4+
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="36" />
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

src/MAUI/Maui.Samples/Samples/Geoprocessing/AnalyzeHotspots/AnalyzeHotspots.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private async void OnRunAnalysisClicked(object sender, EventArgs e)
6565
MyActivityIndicator.IsRunning = true;
6666

6767
// The end date must be at least one day after the start date
68-
if (EndDate.Date <= StartDate.Date.AddDays(1))
68+
if (EndDate.Date <= StartDate.Date.Value.AddDays(1))
6969
{
7070
// Show error message
7171
_ = DisplayAlert("Invalid date range", "Please select valid time range. There has to be at least one day in between To and From dates.", "OK");

0 commit comments

Comments
 (0)