Skip to content

Commit 9ba6ecc

Browse files
nickrandolphnickrandolph
committed
chore: Migrating maui samples to net8
1 parent 49e99d1 commit 9ba6ecc

File tree

90 files changed

+471
-317
lines changed

Some content is hidden

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

90 files changed

+471
-317
lines changed

‎UI/CountryDataSample/CountryDataSample/CountryDataSample.Mobile/CountryDataSample.Mobile.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
2929
<PackageReference Include="Uno.Material.WinUI" />
3030
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
31-
<PackageReference Include="Uno.Extensions.Toolkit.WinUI"/>
3231
<PackageReference Include="Uno.Toolkit.WinUI" />
3332
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
3433
<PackageReference Include="Uno.Extensions.Localization.WinUI" />

‎UI/CountryDataSample/CountryDataSample/CountryDataSample.Wasm/CountryDataSample.Wasm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
6868
<PackageReference Include="Uno.Material.WinUI" />
6969
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
70-
<PackageReference Include="Uno.Extensions.Toolkit.WinUI" />
70+
7171
<PackageReference Include="Uno.Toolkit.WinUI" />
7272
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
7373
<PackageReference Include="Uno.Extensions.Localization.WinUI" />

‎UI/CountryDataSample/CountryDataSample/CountryDataSample.Windows/CountryDataSample.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
3535
<PackageReference Include="Uno.Material.WinUI" />
3636
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
37-
<PackageReference Include="Uno.Extensions.Toolkit.WinUI" />
37+
3838
<PackageReference Include="Uno.Toolkit.WinUI" />
3939
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
4040
<PackageReference Include="Uno.Extensions.Localization.WinUI" />

‎UI/CountryDataSample/CountryDataSample/CountryDataSample/CountryDataSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Uno.Extensions.Logging.WinUI" />
1818
<PackageReference Include="Uno.Material.WinUI" />
1919
<PackageReference Include="Uno.Toolkit.WinUI.Material" />
20-
<PackageReference Include="Uno.Extensions.Toolkit.WinUI" />
20+
2121
<PackageReference Include="Uno.Toolkit.WinUI" />
2222
<PackageReference Include="Uno.Extensions.Hosting.WinUI" />
2323
<PackageReference Include="Uno.Extensions.Localization.WinUI" />

‎UI/CountryDataSample/CountryDataSample/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageVersion Include="Uno.Material.WinUI" Version="4.0.4" />
2424
<PackageVersion Include="Uno.Dsp.Tasks" Version="1.1.0" />
2525
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.15" />
26-
<PackageVersion Include="Uno.Extensions.Toolkit.WinUI" Version="3.0.10" />
26+
2727
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.15" />
2828
<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
2929
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />

‎UI/MauiEmbedding/ArcGisApp/ArcGisApp.Base/ArcGisApp.Base.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
22
<PropertyGroup>
33
<!-- NOTE: The TargetFramework is required by MSBuild but not used as this project is not built. -->
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<EnableDefaultItems>false</EnableDefaultItems>
66
</PropertyGroup>
77

‎UI/MauiEmbedding/ArcGisApp/ArcGisApp.MauiControls/ArcGisApp.MauiControls.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
5-
<TargetFrameworks>$(TargetFrameworks);net7.0;net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
5+
<TargetFrameworks>$(TargetFrameworks);net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
66
<TargetFrameworks Condition="'$(OverrideTargetFrameworks)'!=''">$(OverrideTargetFrameworks)</TargetFrameworks>
77

88
<UseMaui>true</UseMaui>
99
<SingleProject>true</SingleProject>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Esri.ArcGISRuntime.Maui" />
13+
<PackageReference Include="Microsoft.Maui.Controls" />
14+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
15+
<PackageReference Include="Esri.ArcGISRuntime.Maui" />
1416
</ItemGroup>
1517

1618
</Project>

‎UI/MauiEmbedding/ArcGisApp/ArcGisApp.MauiControls/UnoImageConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace ArcGisApp;
44

55
public class UnoImageConverter : IValueConverter
66
{
7-
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
7+
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
88
{
99
#if ANDROID
1010
return (value + "").Replace('/','_').Replace('\\','_');
@@ -13,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1313
#endif
1414
}
1515

16-
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
16+
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
1717
{
1818
throw new NotImplementedException();
1919
}

‎UI/MauiEmbedding/ArcGisApp/ArcGisApp.Mobile/ArcGisApp.Mobile.csproj

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
44
<TargetFrameworks Condition="'$(OverrideTargetFrameworks)'!=''">$(OverrideTargetFrameworks)</TargetFrameworks>
55
<SingleProject>true</SingleProject>
66
<OutputType>Exe</OutputType>
@@ -36,17 +36,22 @@
3636
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
3737
<!--<PackageReference Include="Uno.WinUI.DevServer" Condition="'$(Configuration)'=='Debug'" />-->
3838
<PackageReference Include="SkiaSharp" />
39-
</ItemGroup>
40-
<Choose>
41-
<When Condition="$(IsAndroid)">
42-
<ItemGroup>
39+
<PackageReference Include="Microsoft.Maui.Controls" />
40+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
41+
</ItemGroup>
42+
<Choose>
43+
<When Condition="$(IsAndroid)">
44+
<ItemGroup>
45+
<PackageReference Include="Xamarin.Google.Android.Material" VersionOverride="$(AndroidMaterialVersion)" />
46+
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" VersionOverride="$(AndroidXNavigationVersion)" />
47+
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" VersionOverride="$(AndroidXNavigationVersion)" />
48+
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" VersionOverride="$(AndroidXNavigationVersion)" />
49+
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" VersionOverride="$(AndroidXNavigationVersion)" />
50+
<PackageReference Include="Xamarin.AndroidX.Collection" VersionOverride="$(AndroidXCollectionVersion)" />
51+
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" VersionOverride="$(AndroidXCollectionVersion)" />
52+
4353
<PackageReference Include="Uno.UniversalImageLoader" />
4454

45-
<PackageReference Include="Xamarin.Google.Android.Material" VersionOverride="1.9.0.2" />
46-
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" VersionOverride="2.6.0.1" />
47-
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" VersionOverride="2.6.0.1" />
48-
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" VersionOverride="2.6.0.1" />
49-
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" VersionOverride="2.6.0.1" />
5055
</ItemGroup>
5156
<ItemGroup>
5257
<AndroidEnvironment Include="Android/environment.conf" />

‎UI/MauiEmbedding/ArcGisApp/ArcGisApp.Windows/ArcGisApp.Windows.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
66
<RootNamespace>ArcGisApp.Windows</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -10,6 +10,7 @@
1010
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
1111
<UseWinUI>true</UseWinUI>
1212
<EnableMsixTooling>true</EnableMsixTooling>
13+
<UseRidGraph>true</UseRidGraph>
1314
</PropertyGroup>
1415
<PropertyGroup>
1516
<!-- Bundles the WinAppSDK binaries -->

0 commit comments

Comments
 (0)