Skip to content

Commit 6430074

Browse files
duffhwilliambohrmann3andy-weisZackAllendotMorten
authored
Merge v.next into main for 200.3.0 release (#1331)
Co-authored-by: William Bohrmann <[email protected]> Co-authored-by: Andy Weis <[email protected]> Co-authored-by: Zack Allen <[email protected]> Co-authored-by: Morten Nielsen <[email protected]> Co-authored-by: William Bohrmann <[email protected]> Co-authored-by: Preeti <[email protected]> Co-authored-by: Morten Nielsen <[email protected]> Co-authored-by: Greg De Stigter <[email protected]> Co-authored-by: Teja Balu <[email protected]>
1 parent 0b44bc9 commit 6430074

File tree

150 files changed

+1291
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1291
-214
lines changed

‎src/Directory.Packages.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<ArcGISMapsSDKVersion>200.2.0</ArcGISMapsSDKVersion>
4+
<ArcGISMapsSDKVersion>200.3.0</ArcGISMapsSDKVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
@@ -25,12 +25,14 @@
2525
<PackageVersion Include="CommunityToolkit.Maui" Version="5.0.0" />
2626
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.1.0" />
2727
<PackageVersion Include="WinUIEx" Version="1.8.0" />
28-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221116.1" Condition="'$(UseMaui)'!='true'" />
28+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="'$(UseMaui)'!='true'" />
2929
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="'$(UseMaui)'!='true'" />
3030
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13"/>
3131
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1"/>
3232
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.5.0"/>
3333
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha"/>
34-
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1"/>
34+
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
35+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
36+
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3"/>
3537
</ItemGroup>
3638
</Project>

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

Lines changed: 5 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>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<RootNamespace>ArcGIS.Samples</RootNamespace>
88
<UseMaui>true</UseMaui>
@@ -61,7 +61,7 @@
6161
</ItemGroup>
6262

6363
<!-- Exclude Indoor Positioning on desktop platforms -->
64-
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst')) or $(TargetFramework.StartsWith('net7.0-windows'))">
64+
<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-maccatalyst')) or $(TargetFramework.StartsWith('net8.0-windows'))">
6565
<AndroidResource Remove="Samples\Location\IndoorPositioning\**" />
6666
<Compile Remove="Samples\Location\IndoorPositioning\**" />
6767
<MauiCss Remove="Samples\Location\IndoorPositioning\**" />
@@ -138,11 +138,11 @@
138138
</ItemGroup>
139139

140140
<!-- WinUIEx is used to workaround the lack of a WebAuthenticationBroker for WinUI. https://github.com/microsoft/WindowsAppSDK/issues/441 -->
141-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows10.0.19041.0'">
141+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041.0'">
142142
<PackageReference Include="WinUIEx" />
143143
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
144144
</ItemGroup>
145-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
145+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
146146
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
147147
</ItemGroup>
148148
<ItemGroup>

‎src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<?xaml-comp compile="true" ?>
3-
<ResourceDictionary
4-
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6-
xmlns:esri="http://schemas.esri.com/arcgis/runtime/2013">
3+
<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
5+
xmlns:esri="http://schemas.esri.com/arcgis/runtime/2013">
76

87
<!-- Esri samples helper styles -->
98
<Style x:Key="EsriSampleContainer" TargetType="Grid">
10-
<Setter Property="Grid.RowDefinitions" Value="Auto,*" />
11-
<Setter Property="Grid.ColumnDefinitions" Value="*,Auto" />
9+
<Setter Property="VisualStateManager.VisualStateGroups">
10+
<VisualStateGroupList>
11+
<VisualStateGroup>
12+
<VisualState x:Name="HorizontalFloat">
13+
<VisualState.StateTriggers>
14+
<AdaptiveTrigger MinWindowHeight="{OnPlatform Default=800, WinUI=0}" MinWindowWidth="{OnPlatform Default=800, WinUI=0}" />
15+
</VisualState.StateTriggers>
16+
<VisualState.Setters>
17+
<Setter Property="RowDefinitions" Value="Auto,*" />
18+
<Setter Property="ColumnDefinitions" Value="*,Auto" />
19+
</VisualState.Setters>
20+
</VisualState>
21+
<VisualState x:Name="Vertical">
22+
<VisualState.StateTriggers>
23+
<OrientationStateTrigger Orientation="Portrait" />
24+
</VisualState.StateTriggers>
25+
<VisualState.Setters>
26+
<Setter Property="RowDefinitions" Value="Auto,*" />
27+
<Setter Property="ColumnDefinitions" Value="*" />
28+
</VisualState.Setters>
29+
</VisualState>
30+
<VisualState x:Name="Horizontal">
31+
<VisualState.StateTriggers>
32+
<OrientationStateTrigger Orientation="Landscape" />
33+
</VisualState.StateTriggers>
34+
<VisualState.Setters>
35+
<Setter Property="RowDefinitions" Value="*" />
36+
<Setter Property="ColumnDefinitions" Value="2*,*" />
37+
</VisualState.Setters>
38+
</VisualState>
39+
</VisualStateGroup>
40+
</VisualStateGroupList>
41+
</Setter>
1242
</Style>
1343
<Style x:Key="EsriSampleControlPanel" TargetType="Border">
1444
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light=#dfdfdf, Dark=#303030}" />
@@ -36,8 +66,8 @@
3666
</VisualState.StateTriggers>
3767
<VisualState.Setters>
3868
<Setter Property="Grid.Row" Value="0" />
39-
<Setter Property="Grid.ColumnSpan" Value="2" />
4069
<Setter Property="Grid.Column" Value="0" />
70+
<Setter Property="MaximumHeightRequest" Value="{OnIdiom Phone=300, Tablet=500}" />
4171
</VisualState.Setters>
4272
</VisualState>
4373
<VisualState x:Name="Horizontal">
@@ -46,9 +76,7 @@
4676
</VisualState.StateTriggers>
4777
<VisualState.Setters>
4878
<Setter Property="Grid.Row" Value="0" />
49-
<Setter Property="Grid.RowSpan" Value="2" />
5079
<Setter Property="Grid.Column" Value="1" />
51-
<Setter Property="Grid.ColumnSpan" Value="1" />
5280
</VisualState.Setters>
5381
</VisualState>
5482
</VisualStateGroup>
@@ -76,8 +104,6 @@
76104
</VisualState.StateTriggers>
77105
<VisualState.Setters>
78106
<Setter Property="Grid.Row" Value="1" />
79-
<Setter Property="Grid.RowSpan" Value="1" />
80-
<Setter Property="Grid.ColumnSpan" Value="2" />
81107
<Setter Property="Grid.Column" Value="0" />
82108
</VisualState.Setters>
83109
</VisualState>
@@ -87,7 +113,6 @@
87113
</VisualState.StateTriggers>
88114
<VisualState.Setters>
89115
<Setter Property="Grid.Row" Value="0" />
90-
<Setter Property="Grid.RowSpan" Value="2" />
91116
<Setter Property="Grid.Column" Value="0" />
92117
</VisualState.Setters>
93118
</VisualState>
@@ -453,10 +478,9 @@
453478
<Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
454479
</Style>
455480

456-
<Style
457-
ApplyToDerivedTypes="True"
458-
BasedOn="{StaticResource BaseStyle}"
459-
TargetType="ShellItem" />
481+
<Style ApplyToDerivedTypes="True"
482+
BasedOn="{StaticResource BaseStyle}"
483+
TargetType="ShellItem" />
460484

461485
<Style TargetType="NavigationPage">
462486
<Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Black}}" />

‎src/MAUI/Maui.Samples/Samples/Analysis/DistanceMeasurement/DistanceMeasurement.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
6-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
6+
<Grid Style="{DynamicResource EsriSampleContainer}">
77
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
88
<Border Style="{DynamicResource EsriSampleControlPanel}">
99
<Grid Padding="5">

‎src/MAUI/Maui.Samples/Samples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui"
66
xmlns:sampleViewer="clr-namespace:ArcGIS.Resources">
7-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
7+
<Grid Style="{DynamicResource EsriSampleContainer}">
88
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
99
<Border Style="{DynamicResource EsriSampleControlPanel}">
1010
<VerticalStackLayout Padding="5" Spacing="5">

‎src/MAUI/Maui.Samples/Samples/Analysis/QueryFeatureCountAndExtent/QueryFeatureCountAndExtent.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui"
66
xmlns:sampleViewer="clr-namespace:ArcGIS.Resources">
7-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
7+
<Grid Style="{DynamicResource EsriSampleContainer}">
88
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
99
<Border Style="{DynamicResource EsriSampleControlPanel}">
1010
<Grid Padding="5"

‎src/MAUI/Maui.Samples/Samples/Analysis/ViewshedLocation/ViewshedLocation.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
6-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
6+
<Grid Style="{DynamicResource EsriSampleContainer}">
77
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
88
<Border Style="{DynamicResource EsriSampleControlPanel}">
99
<Grid ColumnSpacing="5"

‎src/MAUI/Maui.Samples/Samples/Data/CreateMobileGeodatabase/CreateMobileGeodatabase.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
5-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
5+
<Grid Style="{DynamicResource EsriSampleContainer}">
66
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
77
<Border Style="{DynamicResource EsriSampleControlPanel}" WidthRequest="{OnIdiom Default=-1}">
88
<Grid RowDefinitions="auto,auto">

‎src/MAUI/Maui.Samples/Samples/Data/EditAndSyncFeatures/EditAndSyncFeatures.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
44
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
55
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
6-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
6+
<Grid Style="{DynamicResource EsriSampleContainer}">
77
<esriUI:MapView x:Name="MyMapView"
88
GeoViewTapped="GeoViewTapped"
99
Style="{DynamicResource EsriSampleGeoView}" />

‎src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
5-
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
5+
<Grid Style="{DynamicResource EsriSampleContainer}">
66
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
77
<Border Style="{DynamicResource EsriSampleControlPanel}">
88
<Grid>

0 commit comments

Comments
 (0)