Skip to content

Commit 6ddecf5

Browse files
jonathanpeppersjonathanpeppers
authored
[android] 20250618 net10.0 ecosystem updates (#30059)
* [android] 20250618 net10.0 ecosystem updates This is WIP, it currently errors with: src\Core\src\Handlers\Toolbar\ToolbarHandler.Android.cs(101,21): error CS7069: Reference to type 'ISavedStateRegistryOwner' claims it is defined in 'Xamarin.AndroidX.SavedState', but it could not be found src\Core\src\Platform\Android\MauiAppCompatActivity.cs(43,6): error CS7069: Reference to type 'ISavedStateRegistryOwner' claims it is defined in 'Xamarin.AndroidX.SavedState', but it could not be found src\Core\src\Platform\Android\Navigation\StackNavigationManager.cs(468,9): error CS7069: Reference to type 'ISavedStateRegistryOwner' claims it is defined in 'Xamarin.AndroidX.SavedState', but it could not be found src\Core\src\Platform\Android\Navigation\StackNavigationManager.cs(468,9): error CS8602: Dereference of a possibly null reference. src\Core\src\Platform\Android\ContextExtensions.cs(467,9): error CS7069: Reference to type 'ISavedStateRegistryOwner' claims it is defined in 'Xamarin.AndroidX.SavedState', but it could not be found This mainly updates Xamarin.AndroidX.Navigation.* packages to a new 2.9.0 version from Google. Going a step further from the recent update in adfe0ec, I continued to refactor and remove MSBuild properties like `$(_XamarinAndroidGlideVersion)` that dependabot won't be able to update. Removed: * `$(_XamarinAndroidGlideVersion)` * `$(_XamarinAndroidXSecurityVersion)` * `$(_XamarinGoogleCryptoTinkAndroidVersion)` * `$(XamarinGooglePlayServicesMaps)` The versions of these packages are now tracked in a single location, `AndroidX.targets`, that dependabot can update. Example [here][0]. [0]: jonathanpeppers/boots@c190ed4 * Incremental AndroidX updates * Xamarin.AndroidX.SavedState 1.3.0.1
1 parent 51b3a2d commit 6ddecf5

File tree

10 files changed

+46
-36
lines changed

10 files changed

+46
-36
lines changed

‎eng/AndroidX.targets‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
11
<Project>
2+
<!-- A list of dependencies from https://github.com/dotnet/android-libraries -->
23
<ItemGroup>
4+
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
5+
<!-- must be kept in sync with the binding library version to it here: -->
6+
<PackageReference Update="Xamarin.Android.Glide" Version="4.16.0.13" />
37
<PackageReference Update="Xamarin.AndroidX.Activity" Version="1.10.1.2" />
4-
<PackageReference Update="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.0.7" />
8+
<PackageReference Update="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.7.1" />
59
<PackageReference Update="Xamarin.AndroidX.Browser" Version="1.8.0.10" />
610
<PackageReference Update="Xamarin.AndroidX.DynamicAnimation" Version="1.1.0.2" />
7-
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.4" />
8-
<PackageReference Update="Xamarin.AndroidX.MediaRouter" Version="1.7.0.10" />
11+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.9.1" />
12+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Process" Version="2.9.1" />
13+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.9.1" />
14+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.9.1" />
15+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" Version="2.9.1" />
16+
<PackageReference Update="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" Version="2.9.1" />
17+
<PackageReference Update="Xamarin.AndroidX.MediaRouter" Version="1.8.0" />
918
<PackageReference Update="Xamarin.AndroidX.Migration" Version="1.0.10" NoWarn="NU1701" />
10-
<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.8.9.2" />
11-
<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.9.2" />
12-
<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.9.2" />
13-
<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.8.9.2" />
19+
<PackageReference Update="Xamarin.AndroidX.Navigation.Common" Version="2.9.0" />
20+
<PackageReference Update="Xamarin.AndroidX.Navigation.Fragment" Version="2.9.0" />
21+
<PackageReference Update="Xamarin.AndroidX.Navigation.Runtime" Version="2.9.0" />
22+
<PackageReference Update="Xamarin.AndroidX.Navigation.UI" Version="2.9.0" />
1423
<PackageReference Update="Xamarin.AndroidX.Palette" Version="1.0.0.33" />
1524
<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.4.0.2" />
25+
<PackageReference Update="Xamarin.AndroidX.SavedState" Version="1.3.0.1" />
1626
<PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.4-alpha07" />
1727
<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.28" />
18-
<PackageReference Update="Xamarin.AndroidX.Transition" Version="1.5.1.6" />
19-
<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.7" />
28+
<PackageReference Update="Xamarin.AndroidX.Transition" Version="1.6.0" />
29+
<PackageReference Update="Xamarin.AndroidX.Window.WindowJava" Version="1.4.0" />
2030
<PackageReference Update="Xamarin.Build.Download" Version="0.11.4" />
2131
<PackageReference Update="Xamarin.Firebase.AppIndexing" Version="120.0.0.25" />
2232
<PackageReference Update="Xamarin.Google.Android.Material" Version="1.12.0.4" />
23-
<PackageReference Update="Xamarin.Google.Crypto.Tink.Android" Version="1.17.0.2" />
33+
<PackageReference Update="Xamarin.Google.Crypto.Tink.Android" Version="1.18.0" />
34+
<PackageReference Update="Xamarin.GooglePlayServices.Maps" Version="119.2.0.2" />
2435
</ItemGroup>
2536
</Project>

‎eng/NuGetVersions.targets‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,6 @@
154154
Update="Microsoft.Graphics.Win2D"
155155
Version="$(MicrosoftGraphicsWin2DPackageVersion)"
156156
/>
157-
<PackageReference
158-
Update="Xamarin.Android.Glide"
159-
Version="$(_XamarinAndroidGlideVersion)"
160-
/>
161-
<PackageReference
162-
Update="Xamarin.AndroidX.Security.SecurityCrypto"
163-
Version="$(_XamarinAndroidXSecurityVersion)"
164-
/>
165-
<PackageReference
166-
Update="Xamarin.Google.Crypto.Tink.Android"
167-
Version="$(_XamarinGoogleCryptoTinkAndroidVersion)"
168-
/>
169157
<PackageReference
170158
Update="Microsoft.AspNetCore.Authorization"
171159
Version="$(MicrosoftAspNetCoreAuthorizationPackageVersion)"

‎eng/Versions.props‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@
115115
<MicrosoftBuildFrameworkPackageVersion>17.9.5</MicrosoftBuildFrameworkPackageVersion>
116116
<MicrosoftBuildUtilitiesCorePackageVersion>17.9.5</MicrosoftBuildUtilitiesCorePackageVersion>
117117
<MonoApiToolsMSBuildTasksPackageVersion>0.4.0</MonoApiToolsMSBuildTasksPackageVersion>
118-
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
119-
<!-- must be kept in sync with the binding library version to it here: -->
120-
<_XamarinAndroidGlideVersion>4.16.0.13</_XamarinAndroidGlideVersion>
121-
<_XamarinAndroidXSecurityVersion>1.1.0.4-alpha07</_XamarinAndroidXSecurityVersion>
122-
<_XamarinGoogleCryptoTinkAndroidVersion>1.17.0.2</_XamarinGoogleCryptoTinkAndroidVersion>
123-
<!-- Android Maps -->
124-
<XamarinGooglePlayServicesMaps>119.2.0.2</XamarinGooglePlayServicesMaps>
125118
<!--
126119
SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
127120
- NuGet versions below

‎src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
<ItemGroup>
1313
<PackageReference Include="Xamarin.Firebase.AppIndexing" />
1414
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
15+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
16+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
17+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
18+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
19+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
1520
</ItemGroup>
1621

1722
<ItemGroup>

‎src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
14+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
15+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
16+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
17+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
18+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
1419
<PackageReference Include="Xamarin.Google.Android.Material" />
15-
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="$(XamarinGooglePlayServicesMaps)" />
20+
<PackageReference Include="Xamarin.GooglePlayServices.Maps" />
1621
</ItemGroup>
1722

1823
<ItemGroup>

‎src/Controls/Foldable/src/Controls.Foldable.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
</ItemGroup>
3636
<ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
3737
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
38+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
39+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
40+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
41+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
42+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
3843
<PackageReference Include="Xamarin.Google.Android.Material" />
3944
</ItemGroup>
4045
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">

‎src/Core/maps/src/Maps.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
3333

3434
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
35-
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="$(XamarinGooglePlayServicesMaps)" />
35+
<PackageReference Include="Xamarin.GooglePlayServices.Maps" />
3636
<PackageReference Include="Xamarin.AndroidX.Transition" />
3737
</ItemGroup>
3838

‎src/Core/src/Core.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,14 @@
4848
</ItemGroup>
4949
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
5050
<AndroidGradleProject Include="../AndroidNative/build.gradle" ModuleName="maui" />
51-
<PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
51+
<PackageReference Include="Xamarin.Android.Glide" />
5252
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
53+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" />
54+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
55+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" />
56+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" />
57+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" />
58+
<PackageReference Include="Xamarin.AndroidX.SavedState" />
5359
<PackageReference Include="Xamarin.Google.Android.Material" />
5460
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" />
5561
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />

‎src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<Using Include="BenchmarkDotNet.Order" />
2929
<Using Include="BenchmarkDotNet.Running" />
3030
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
31-
<PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
31+
<PackageReference Include="Xamarin.Android.Glide" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />

‎src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<_ValuesToReplace Include="MicrosoftWindowsAppSDKPackageVersion" PropertyName="MicrosoftWindowsAppSDKPackageVersion" />
2828
<_ValuesToReplace Include="MicrosoftWindowsWebView2PackageVersion" PropertyName="MicrosoftWindowsWebView2PackageVersion" />
2929
<_ValuesToReplace Include="TizenUIExtensionsVersion" PropertyName="TizenUIExtensionsVersion" />
30-
<_ValuesToReplace Include="_XamarinAndroidGlideVersion" PropertyName="_XamarinAndroidGlideVersion" />
31-
<_ValuesToReplace Include="_XamarinAndroidXSecurityVersion" PropertyName="_XamarinAndroidXSecurityVersion" />
32-
<_ValuesToReplace Include="_XamarinGoogleCryptoTinkAndroidVersion" PropertyName="_XamarinGoogleCryptoTinkAndroidVersion" />
3330
</ItemGroup>
3431

3532
<Import Project="$(MauiRootDirectory)eng/ReplaceText.targets" />

0 commit comments

Comments
 (0)