Skip to content

Update to 300.1.0 #1793

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

Merged
imalcolm1 merged 1 commit into from
Apr 22, 2026
Merged

Update to 300.1.0 #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">300.0.0</ArcGISMapsSDKVersion>
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">300.1.0</ArcGISMapsSDKVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
Expand Down Expand Up @@ -30,8 +30,7 @@
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.6" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.51" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
</ItemGroup>
</Project>
7 changes: 2 additions & 5 deletions src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>ArcGIS.Samples</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -143,9 +143,6 @@
<PackageReference Include="WinUIEx" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
</ItemGroup>
<ItemGroup>
<MauiXaml Update="Views\*.xaml">
<Generator>MSBuild:Compile</Generator>
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Platforms/Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgisruntime.samples.maui" android:versionCode="9" android:versionName="300.0.0">
<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>
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35" />
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="36" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Geoprocessing/AnalyzeHotspots/AnalyzeHotspots.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private async void OnRunAnalysisClicked(object sender, EventArgs e)
MyActivityIndicator.IsRunning = true;

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