Skip to content
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.

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

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

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
58960d2
research/investigation initial commit
moljac Dec 9, 2024
28cb1ec
androidx.activity
moljac Dec 11, 2024
f237e90
corrected errors reported
moljac Dec 11, 2024
7da4608
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Dec 17, 2024
9851f16
androidx.activity.activity fixes
moljac Dec 17, 2024
261a7d0
Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of …
moljac Dec 17, 2024
14e2832
cleanup
moljac Dec 17, 2024
3536668
androidx.appcompat metadata
moljac Dec 18, 2024
ece3cf2
androidx.preference
moljac Dec 18, 2024
e4118ae
androidx.recyclerview
moljac Dec 18, 2024
07db88d
androidx.swiperefreshlayout
moljac Dec 18, 2024
c5d79e4
androidx.transition
moljac Dec 18, 2024
bc24c3c
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Dec 19, 2024
8edbb35
com.google.android.material.material fixes and generated code removal
moljac Dec 19, 2024
3f56736
com.google.crypto.tink fixes and generated code removal
moljac Dec 19, 2024
5d171ef
com.google.android.gms.play-services-base
moljac Dec 19, 2024
92a5150
com.google.android.gms.play-services-maps
moljac Dec 19, 2024
91302b8
com.google.android.gms.play-services-maps
moljac Dec 19, 2024
3855cd3
com.google.protobuf.protobuf-lite fixes and generated code removal
moljac Dec 20, 2024
93b34d5
com.google.protobuf.protobuf-javalite fixes and generated code cleanup
moljac Dec 21, 2024
55db5a8
com.google.firebase.protolite-well-known-types fixes
moljac Dec 21, 2024
6d23067
com.google.firebase.firebase-perf fixes
moljac Dec 22, 2024
4f0036d
com.google.firebase.firebase-firestore
moljac Dec 30, 2024
8735088
com.google.firebase.firebase-firestore final fixes and cleanup
moljac Dec 30, 2024
2fcd504
com.google.mlkit.common generated code cleanup
moljac Dec 30, 2024
b75448c
com.google.firebase.firebase-storage generaed code removal
moljac Dec 30, 2024
c94fb8b
com.google.mlkit.object-detection-custom cleanup
moljac Dec 30, 2024
00fc509
com.google.mlkit.image-labeling-automl generated code cleanup
moljac Dec 30, 2024
5347aa7
com.google.mlkit.object-detection generated code removal
moljac Dec 30, 2024
f7cb4dd
com.google.mlkit.vision-common generated code cleanup
moljac Dec 30, 2024
7a01332
tensorflow cleanuo
moljac Jan 1, 2025
ee024ca
compose.animations cleanup
moljac Jan 1, 2025
bc8fb92
defines
moljac Jan 1, 2025
525d804
androidx.car cleanup
moljac Jan 1, 2025
f899eca
androidx.emoji.emoji generated code removal
moljac Jan 1, 2025
4ed8c19
androidx.compose.runtime.runtime-android cleanup
moljac Jan 1, 2025
6ddf6f0
androidx.leanback.leanback cleanup
moljac Jan 1, 2025
2a80d19
androidx.legacy.legacy-support-core-ui cleanup
moljac Jan 1, 2025
dd692a9
androidx.media3.media3-exoplayer-hls cleanup
moljac Jan 2, 2025
f0a3eb3
androidx.media3.media3-ui cleanup
moljac Jan 2, 2025
cb78342
Update published-namespaces.txt
moljac Jan 2, 2025
2e57607
androidx.preference.preference cleanup
moljac Jan 2, 2025
6d080af
androidx.recyclerview cleanup
moljac Jan 2, 2025
ed5dd27
com.google.android.gms.play-services-games cleanup
moljac Jan 2, 2025
c34fc7f
androidx.media3.session cleanup and fixes
moljac Jan 3, 2025
fb2bb69
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Jan 9, 2025
ca1333d
cleanup
moljac Jan 11, 2025
e587d98
net9.0 setup
moljac Jan 11, 2025
39f6caf
Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of …
moljac Jan 11, 2025
8f83347
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Jan 16, 2025
630865c
androidx.activity
moljac Jan 17, 2025
0fae09d
Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of …
moljac Jan 17, 2025
7f38a20
fixes for net8.0 in Additions after metadata fixes
moljac Jan 17, 2025
83f9f88
Update utilities.cake
moljac Jan 17, 2025
1cff350
automagic files
moljac Jan 17, 2025
362873c
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Jan 28, 2025
4304b13
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Feb 1, 2025
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
2 changes: 1 addition & 1 deletion build/ci/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
pool: ${{ parameters.buildPool }}
workspace:
clean: all

templateContext:
sdl:
spotBugs:
Expand Down
4 changes: 2 additions & 2 deletions build/ci/job-extended-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ parameters:
testProject: # The test .csproj to build
testAssembly: # The test .dll to execute
runDotnetNextTest: false

tools: # Additional .NET global tools to install
- 'dotnet-test-slicer' : '0.1.0-alpha7'
- 'Cake.Tool': '4.0.0'

jobs:
- job: ${{ parameters.jobName }}_package_tests
displayName: ${{ parameters.jobName }} Package Tests
Expand Down
4 changes: 2 additions & 2 deletions build/ci/stage-extended-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
stageCondition: # When to run this stage
buildPool: # VM pool information
runDotnetNextTest: false

stages:
- stage: extended_tests
displayName: Extended Tests
Expand All @@ -22,7 +22,7 @@ stages:
testAssembly: $(extendedTestAssembly)
buildPool: ${{ parameters.buildPool }}
runDotnetNextTest: ${{ parameters.runDotnetNextTest }}

# Disabled because of too many failures until MAUI updates its AndroidX packages
# - template: job-extended-tests.yml
# parameters:
Expand Down
4 changes: 2 additions & 2 deletions build/ci/stage-standard-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
buildPool: # VM pool information
stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true')) # When to run this stage
runDotnetNextTest: false

stages:
- stage: standard_tests
displayName: Standard Tests
Expand All @@ -21,4 +21,4 @@ stages:
testProject: $(standardTestProject)
testAssembly: $(standardTestAssembly)
buildPool: ${{ parameters.buildPool }}
runDotnetNextTest: ${{ parameters.runDotnetNextTest }}
runDotnetNextTest: ${{ parameters.runDotnetNextTest }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#TimingDataCake, data.timestamp, data.task, data.duration
#TimingDataCake, 20241230-153719.26, inject-variables, 00:00:00
#TimingDataCake, 20241230-153720.63, javadocs-gps, 00:00:01.3624489
#TimingDataCake, 20241230-153843.77, binderate, 00:01:23.1432200
#TimingDataCake, 20241230-153844.1, metadata-verify, 00:00:00.3327316
#TimingDataCake, 20241230-153905.62, libs-native, 00:00:21.5126355
#TimingDataCake, 20241230-154632.43, libs, 00:07:26.7990019
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#TimingDataStopwatch, data.timestamp, data.task, data.duration
#TimingDataStopwatch, 20241230-153719.26, inject-variables, 00:00:00.0003172
#TimingDataStopwatch, 20241230-153720.63, javadocs-gps, 00:00:01.3627711
#TimingDataStopwatch, 20241230-153843.77, binderate, 00:01:24.5059941
#TimingDataStopwatch, 20241230-153844.1, metadata-verify, 00:01:24.8387294
#TimingDataStopwatch, 20241230-153905.62, libs-native, 00:01:46.3513845
#TimingDataStopwatch, 20241230-154632.43, libs, 00:09:13.1504700
3 changes: 0 additions & 3 deletions docs/artifact-list-with-versions.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Artifacts with versions supported




| | | | | |
|----|----------------------------------------------------------------------|--------------------|----------------------------------------------------------------------|--------------------|
| 1|androidx.activity:activity |1.10.0 |Xamarin.AndroidX.Activity |1.10.0 |
Expand Down
4 changes: 2 additions & 2 deletions published-namespaces.txt
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,7 @@ Google.Ads.Mediation
Google.Ads.Mediation.Admob
Google.Ads.Nonagon.Util.Logging.Csi
Google.Android.Gms.Ads.Nonagon.SignalGeneration
Google.Android.Gms.Maps.Internal
Google.Android.Libraries.AppActions.Service
Google.Android.Libraries.Places.Api.Auth
Google.Android.Material.Animation
Expand Down Expand Up @@ -1040,6 +1041,7 @@ Google.Android.Material.Transition
Google.Android.Material.Transition.Platform
Google.AndroidLibraries.BarHopper
Google.Api
Google.Apphosting.DataStore.Testing
Google.Assistant.AppActions.Suggestions
Google.Assistant.AppActions.Suggestions.Client
Google.Assistant.AppActions.Widgets
Expand Down Expand Up @@ -1435,9 +1437,7 @@ Xamarin.Google.MLKit.Vision.MediaPipe.Segmentation
Xamarin.Google.MLKit.Vision.MediaPipe.Utils
Xamarin.Google.MLKit.Vision.Objects
Xamarin.Google.MLKit.Vision.Objects.Custom
Xamarin.Google.MLKit.Vision.Objects.Custom.Internal
Xamarin.Google.MLKit.Vision.Objects.Defaults
Xamarin.Google.MLKit.Vision.Objects.Defaults.Internal
Xamarin.Google.MLKit.Vision.Objects.Internal
Xamarin.Google.MLKit.Vision.Pose
Xamarin.Google.MLKit.Vision.Pose.Accurate
Expand Down
2 changes: 1 addition & 1 deletion source/_PackageLevelCustomizations.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<PropertyGroup>
<_AndroidEmitLegacyInterfaceInvokers>true</_AndroidEmitLegacyInterfaceInvokers>
</PropertyGroup>
}
}
245 changes: 0 additions & 245 deletions source/androidx.activity/activity/Additions/ActivityResultContracts.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using Android.Runtime;
using Java.Interop;
using Java.Lang;

#if NET9_0_OR_GREATER

namespace AndroidX.Activity.Result.Contract
{
}

#endif
Loading