[.NET10] removal of `generator` generated code in `Additions/` #1058

moljac · 2024-12-10T12:14:29Z

Context: due to the changes in generator.exe output old generator code that was used must be removed or regenerated.

Initial investigation - files:

Highest priority for MAUI (needs deeper investigation, because of transitive dependencies):

./source/androidx.activity/activity/Additions/ActivityResultContracts.cs
./source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs
./source/androidx.appcompat/appcompat/Additions/Additions.cs
./source/androidx.preference/preference/Additions/Additions.cs
./source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs
./source/androidx.recyclerview/recyclerview-selection/Additions/AndroidX.RecyclerView.Selection.SelectionTracker.cs
./source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs
./source/androidx.transition/transition/Additions/Additions.cs

./source/com.google.android.material/material/Additions/Additions.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Tabs.AppCompat.App.AppCompatActivity.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs


./source/com.google.android.gms/play-services-base/Additions/Additions.cs
./source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs
./source/com.google.android.gms/play-services-base/Additions/GoogleSignInAccount.cs
./source/com.google.android.gms/play-services-base/Additions/GoogleSignInOptions.cs
./source/com.google.android.gms/play-services-base/Additions/Statuses.cs
./source/com.google.android.gms/play-services-maps/Additions/Additions.cs

./source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs
./source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs
./source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs

Full list:

./source/androidx.activity/activity/Additions/ActivityResultContracts.cs
./source/androidx.appcompat/appcompat/Additions/ActionMenuView.cs
./source/androidx.appcompat/appcompat/Additions/Additions.cs
./source/androidx.car/car/Additions/Additions.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs
./source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs
./source/androidx.compose.runtime/runtime-android/Additions/AndroidX.Compose.Runtime.Snapshots.SnapshotStateMap.cs
./source/androidx.dynamicanimation/dynamicanimation/Additions/Additions.cs
./source/androidx.emoji/emoji/Additions/Additions.cs
./source/androidx.leanback/leanback/Additions/Additions.cs
./source/androidx.leanback/leanback/Additions/ConstantState.cs
./source/androidx.leanback/leanback/Additions/StreamingTextView.cs
./source/androidx.legacy/legacy-support-core-ui/Additions/Additions.cs
./source/androidx.media3/media3-exoplayer-hls/Additions/AndroidX.Media3.ExoPlayer.Hls.Playlist.HlsPlaylist.cs
./source/androidx.media3/media3-ui/Additions/DefaultTimeBar.cs
./source/androidx.preference/preference/Additions/Additions.cs
./source/androidx.recyclerview/recyclerview-selection/Additions/Additions.cs
./source/androidx.recyclerview/recyclerview-selection/Additions/AndroidX.RecyclerView.Selection.SelectionTracker.cs
./source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/Additions.cs
./source/androidx.transition/transition/Additions/Additions.cs
./source/androidx.wear.watchface/watchface-style/Additions/AndroidX.Wear.Watchface.Style.UserStyle.cs
./source/com.google.android.gms/play-services-ads-lite/Additions/Additions.cs
./source/com.google.android.gms/play-services-base/Additions/Additions.cs
./source/com.google.android.gms/play-services-base/Additions/BitmapTeleporter.cs
./source/com.google.android.gms/play-services-base/Additions/GoogleSignInAccount.cs
./source/com.google.android.gms/play-services-base/Additions/GoogleSignInOptions.cs
./source/com.google.android.gms/play-services-base/Additions/Statuses.cs
./source/com.google.android.gms/play-services-fido/Additions/TaskExtensions.cs
./source/com.google.android.gms/play-services-fitness/Additions/IPendingResultExtensions.cs
./source/com.google.android.gms/play-services-fitness/Additions/TaskExtensions.cs
./source/com.google.android.gms/play-services-games/Additions/Android.Gms.Games.GamesClass.cs
./source/com.google.android.gms/play-services-maps/Additions/Additions.cs
./source/com.google.android.gms/play-services-mlkit-barcode-scanning/Additions/Additions.cs
./source/com.google.android.gms/play-services-mlkit-text-recognition-common/Additions/Additions.cs
./source/com.google.android.gms/play-services-nearby/Additions/IPendingResultExtensions.cs
./source/com.google.android.gms/play-services-nearby/Additions/TaskAdditions.cs
./source/com.google.android.gms/play-services-vision/Additions/Additions.cs
./source/com.google.android.gms/play-services-wearable/Additions/TaskExtensions.cs
./source/com.google.android.material/material/Additions/Additions.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Snackbar.Snackbar.cs
./source/com.google.android.material/material/Additions/Google.Android.Material.Tabs.AppCompat.App.AppCompatActivity.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.LazyStringArrayList.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.MapFieldLite.cs
./source/com.google.crypto.tink/tink-android/Additions/Xamarin.Google.Crypto.Tink.Shaded.Protobuf.UnmodifiableLazyStringList.cs
./source/com.google.firebase/firebase-appcheck/Additions/Firebase.AppCheck.FirebaseAppCheck.cs
./source/com.google.firebase/firebase-appcheck/Additions/Firebase.AppCheck.Internal.DefaultFirebaseAppCheck.cs
./source/com.google.firebase/firebase-appindexing/Additions/Additions.cs
./source/com.google.firebase/firebase-firestore/Additions/Additions.cs
./source/com.google.firebase/firebase-storage/Additions/Additions.cs
./source/com.google.mlkit/common/Additions/Additions.cs
./source/com.google.mlkit/common/Additions/Xamarin.Google.MLKit.Common.SDKInternal.OptionalModuleUtils.cs
./source/com.google.mlkit/image-labeling-automl/Additions/AutoMLImageLabelerOptions.cs
./source/com.google.mlkit/object-detection-custom/Additions/Xamarin.Google.MLKit.Vision.Objects.Custom.Internal.CustomObjectsRegistrar.cs
./source/com.google.mlkit/object-detection/Additions/Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal.DefaultObjectsRegistrar.cs
./source/com.google.mlkit/vision-common/Additions/Additions.cs
./source/com.google.protobuf/protobuf-javalite/Additions/Additions.cs
./source/com.google.protobuf/protobuf-lite/Additions/LazyStringArrayList.cs
./source/com.google.protobuf/protobuf-lite/Additions/MapFieldLite.cs
./source/io.grpc/grpc-api/Additions/Xamarin.Grpc.CodecGzip.cs
./source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.cs
./source/org.tensorflow/tensorflow-lite-support-api/Additions/Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.cs

Details

Some bugs (generics arity) or missing features in generator were solved by using remove-node with previously copied generator code which was added to Additions/ and manually modified.

jpobst · 2024-12-10T20:04:51Z

Honestly that list isn't as bad as I feared.

I guess for each manual code we have 3 options:

If generator has fixed the bug, remove the addition and the <remove-node> and let generator do its thing.
Remove the addition, which will break API compatibility.
Commit both a NET8_0/NET9_0 manual version and a NET10_0_OR_GREATER manual version.

I suspect we'll have to do option (3) for most of these.

moljac · 2024-12-11T16:02:55Z

Honestly that list isn't as bad as I feared.

I was pretty scared when JonP told me, but after I searched and gathered some info. It does not look bad.

I guess for each manual code we have 3 options:

If generator has fixed the bug, remove the addition and the <remove-node> and let generator do its thing.

Remove the addition, which will break API compatibility.

Commit both a NET8_0/NET9_0 manual version and a NET10_0_OR_GREATER manual version.

I suspect we'll have to do option (3) for most of these.

This is what I intended - early discussion and those points were in my plan too.

Maybe additionally

Fix the generator along the way based on research (only if it is not too complex)

Bugs/problems will be in comments. 1st one coming in today.

moljac · 2024-12-11T16:10:54Z

20241211 Problem

android-libraries/source/androidx.activity/activity/Transforms/Metadata.xml

Lines 402 to 408 in f237e90

    
               <!-- 
        
               Problem!!! 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(526,24): error CS0534: 'ActivityResultContracts.OpenDocument' does not implement inherited abstract member 'ActivityResultContract.CreateIntent(Context, Object?)' [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(776,24): error CS0534: 'ActivityResultContracts.OpenMultipleDocuments' does not implement inherited abstract member 'ActivityResultContract.CreateIntent(Context, Object?)' [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(1638,31): error CS0534: 'ActivityResultContracts.RequestMultiplePermissions' does not implement inherited abstract member 'ActivityResultContract.CreateIntent(Context, Object?)' [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
               -->

For errors like:

error CS0534: 'ActivityResultContracts.OpenDocument' does not implement inherited abstract member 'ActivityResultContract.CreateIntent(Context, Object?)'

Fix is to change parameter managedType (Variant A) like

android-libraries/source/androidx.activity/activity/Transforms/Metadata.xml

Lines 395 to 400 in f237e90

    
           <attr 
        
               path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.CreateDocument']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String']]/parameter[2]" 
        
               name="managedType" 
        
               > 
        
               Java.Lang.Object 
        
           </attr>

but in some cases this does not work:

 error CS0266: Cannot implicitly convert type 'System.Collections.Generic.IList<Android.Net.Uri>' to 'Java.Lang.Object'. An explicit conversion exists (are you missing a cast?)

Less optional alternative (Variant B) would be to change native Java typewhich leads to similar errors:

android-libraries/source/androidx.activity/activity/Transforms/Metadata.xml

Lines 455 to 478 in f237e90

    
               Variant B - change `type` 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(883,13): error CS0266: Cannot implicitly convert type 'System.Collections.Generic.IList<Android.Net.Uri>' to 'Java.Lang.Object'. An explicit conversion exists (are you missing a cast?) [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(1104,13): error CS0266: Cannot implicitly convert type 'System.Collections.Generic.IList<Android.Net.Uri>' to 'Java.Lang.Object'. An explicit conversion exists (are you missing a cast?) [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
           ./generated/androidx.activity.activity/obj/Debug/net8.0-android/generated/src/AndroidX.Activity.Result.Contract.ActivityResultContracts.cs(1784,13): error CS0266: Cannot implicitly convert type 'System.Collections.Generic.IDictionary<string, Java.Lang.Boolean>' to 'Java.Lang.Object'. An explicit conversion exists (are you missing a cast?) [./generated/androidx.activity.activity/androidx.activity.activity.csproj::TargetFramework=net8.0-android] 
        
               <attr 
        
                   path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenDocument']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]/parameter[2]" 
        
                   name="type" 
        
                   > 
        
                   java.lang.Object 
        
               </attr> 
        
               <attr 
        
                   path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.OpenMultipleDocuments']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]/parameter[2]" 
        
                   name="type" 
        
                   > 
        
                   java.lang.Object 
        
               </attr> 
        
               <attr 
        
                   path="/api/package[@name='androidx.activity.result.contract']/class[@name='ActivityResultContracts.RequestMultiplePermissions']/method[@name='createIntent' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String[]']]/parameter[2]" 
        
                   name="type" 
        
                   > 
        
                   java.lang.Object 
        
               </attr>

…rounds

…ttps://github.com/dotnet/android-libraries into mu-20241209-net10-removal-of-generator-workarounds

…rounds

moljac · 2024-12-19T13:19:19Z

/azp run

azure-pipelines · 2024-12-19T13:19:38Z

Azure Pipelines successfully started running 1 pipeline(s).

research/investigation initial commit

58960d2

moljac marked this pull request as draft December 10, 2024 15:14

moljac added 2 commits December 11, 2024 16:01

androidx.activity

28cb1ec

corrected errors reported

f237e90

moljac added 10 commits December 17, 2024 10:24

Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…

7da4608

…rounds

androidx.activity.activity fixes

9851f16

Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of h…

261a7d0

…ttps://github.com/dotnet/android-libraries into mu-20241209-net10-removal-of-generator-workarounds

cleanup

14e2832

androidx.appcompat metadata

3536668

androidx.preference

ece3cf2

androidx.recyclerview

e4118ae

androidx.swiperefreshlayout

07db88d

androidx.transition

c5d79e4

Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…

bc24c3c

…rounds

moljac added 9 commits December 19, 2024 16:27

com.google.android.material.material fixes and generated code removal

8edbb35

com.google.crypto.tink fixes and generated code removal

3f56736

com.google.android.gms.play-services-base

5d171ef

com.google.android.gms.play-services-maps

92a5150

com.google.android.gms.play-services-maps

91302b8

com.google.protobuf.protobuf-lite fixes and generated code removal

3855cd3

com.google.protobuf.protobuf-javalite fixes and generated code cleanup

93b34d5

com.google.firebase.protolite-well-known-types fixes

55db5a8

com.google.firebase.firebase-perf fixes

6d23067

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[.NET10] removal of `generator` generated code in `Additions/` #1058

[.NET10] removal of `generator` generated code in `Additions/` #1058

moljac commented Dec 10, 2024 •

edited

Loading

jpobst commented Dec 10, 2024

moljac commented Dec 11, 2024

moljac commented Dec 11, 2024

moljac commented Dec 19, 2024

azure-pipelines bot commented Dec 19, 2024

[.NET10] removal of generator generated code in Additions/ #1058

Are you sure you want to change the base?

[.NET10] removal of generator generated code in Additions/ #1058

Conversation

moljac commented Dec 10, 2024 • edited Loading

Details

jpobst commented Dec 10, 2024

moljac commented Dec 11, 2024

moljac commented Dec 11, 2024

moljac commented Dec 19, 2024

azure-pipelines bot commented Dec 19, 2024

[.NET10] removal of `generator` generated code in `Additions/` #1058

[.NET10] removal of `generator` generated code in `Additions/` #1058

moljac commented Dec 10, 2024 •

edited

Loading