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

[DO NOT MERGE][OLD][.NET10] removal of generator generated code in Additions/ #1058

Draft
wants to merge 158 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 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
8581c2e
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Feb 4, 2025
bbecf25
media3 fixes
moljac Feb 5, 2025
6a8c7eb
Update .gitignore
moljac Feb 6, 2025
fc9db32
add net10 build scripts
moljac Feb 6, 2025
6d2ffbf
Create build-dotnet-android.cake
moljac Feb 6, 2025
05efe06
net10.0 fixes for net8.0
moljac Feb 6, 2025
362e2bc
feeds needed for net10.0 builds
moljac Feb 6, 2025
3e3ff52
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Feb 6, 2025
2bbe544
net10 CI builds added
moljac Feb 6, 2025
075885f
Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of …
moljac Feb 6, 2025
718cd75
nuget.org addded
moljac Feb 6, 2025
3a80bee
net10 builds clean
moljac Feb 6, 2025
fea2c4d
removal of global.json
moljac Feb 7, 2025
3ef2914
Update build-dotnet-android.cake
moljac Feb 7, 2025
0350770
ignore output folders for multiple TFM builds
moljac Feb 7, 2025
610804f
fixes
moljac Feb 7, 2025
46db30d
reenable parallel.invoke
moljac Feb 10, 2025
6a9142b
cleanup
moljac Feb 12, 2025
1725528
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Feb 13, 2025
4375bea
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Feb 24, 2025
7cc592c
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Mar 4, 2025
acbe65c
Update Additions.cs
moljac Mar 4, 2025
df55bb8
Update AndroidX.Media3.ExoPlayer.IExoPlayer.cs
moljac Mar 4, 2025
78d17f1
Update Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs
moljac Mar 4, 2025
1c14eb2
Create Kotlin.Ranges.CharRange.cs
moljac Mar 4, 2025
7bd4e69
Update Metadata.xml
moljac Mar 4, 2025
3e7acf3
Update _PackageLevelCustomizations.cshtml
moljac Mar 4, 2025
600ccfb
Update build-and-package.cake
moljac Mar 4, 2025
b17b220
Update build-dotnet-android.cake
moljac Mar 4, 2025
5ea1b5b
kotlin green
moljac Mar 4, 2025
f1b2e2e
leanback fixes for net10
moljac Mar 4, 2025
97e6e4e
Update AndroidX.Media3.ExoPlayer.IExoPlayer.cs
moljac Mar 4, 2025
5a593c3
Update Xamarin.Google.Crypto.Tink.Shaded.Protobuf.Internal.cs
moljac Mar 4, 2025
6ac579f
media3 fixes
moljac Mar 5, 2025
b6f2f9a
work-runtime cleanup
moljac Mar 5, 2025
0c44a41
crypto-tink fixes
moljac Mar 5, 2025
0d034d6
Update Metadata.xml
moljac Mar 5, 2025
0134618
packaging working
moljac Mar 5, 2025
31213c3
CI scripts merge confilcts fixed
moljac Mar 6, 2025
5ad9202
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Mar 6, 2025
7392367
update, cleanup and CI fixes
moljac Mar 6, 2025
a6ccead
Update build-dotnet-android.cake
moljac Mar 8, 2025
3317b91
Update NuGet.config
moljac Mar 8, 2025
9df8430
Update build-dotnet-android.cake
moljac Mar 10, 2025
44c150d
added private feed for tests and public feed for cake scripts
moljac Mar 10, 2025
8dee517
packaging green
moljac Mar 11, 2025
614519b
script fixes and improvements
moljac Mar 11, 2025
d0cad54
leanback fixes
moljac Mar 12, 2025
993a033
MaxDegreeOfParallelism fixed
moljac Mar 12, 2025
75deafe
removed nuget.org (CI builds securit requirement)
moljac Mar 13, 2025
b985132
instructions in script added
moljac Mar 13, 2025
402bbca
renamed script
moljac Mar 13, 2025
12192d2
script include/load fix after renaming
moljac Mar 14, 2025
676e71c
docs/notes
moljac Mar 14, 2025
8fea572
rounding used
moljac Mar 14, 2025
08f341c
cast added
moljac Mar 14, 2025
9c311c0
timings cleanup (not needed yet)
moljac Mar 14, 2025
ab22a34
Create global.json
moljac Mar 14, 2025
eca40e3
Update global.json
moljac Mar 14, 2025
3571cde
refactoring for global.json juggling
moljac Mar 14, 2025
9300ffb
fixed versions
moljac Mar 14, 2025
865c071
newline at the end
moljac Mar 14, 2025
5b747b1
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Mar 14, 2025
ce53c20
Merge branch 'mu-20241209-net10-removal-of-generator-workarounds' of …
moljac Mar 14, 2025
dff669b
build cmd fixed
moljac Mar 15, 2025
05ab01e
cleanup
moljac Mar 15, 2025
a375b30
fix for local feed in nuget.config
moljac Mar 15, 2025
23fd3a6
Cake.CoreCLR commented out (needed for debugging)
moljac Mar 15, 2025
b8a57cf
whitespace removed
moljac Mar 15, 2025
073be65
dotnet 10.0.100-preview.1.25120.13 fo CI builds
moljac Mar 15, 2025
64f7f70
CI build - initial commit
moljac Mar 16, 2025
192dea2
cake script fixes
moljac Mar 16, 2025
5cc60d4
script fixes
moljac Mar 16, 2025
d0069fd
Added output to scripts
moljac Mar 16, 2025
9804c59
step name changed to build-android-libraries-net10-net8
moljac Mar 17, 2025
e621342
dotnetNextFrameworkVersion bumped
moljac Mar 17, 2025
5df109a
switch to use installed dotnet
moljac Mar 17, 2025
ccabd7b
Merge branch 'main' into mu-20241209-net10-removal-of-generator-worka…
moljac Mar 18, 2025
b79f43a
further cleanup
moljac Mar 18, 2025
35b37c0
old version renamed script
moljac Mar 18, 2025
d2d6117
Update build-android-libraries-net10-net8.initial.cake
moljac Mar 18, 2025
c34e6f8
Update build-android-libraries-net10-net8.cake
moljac Mar 18, 2025
67bb7eb
fix for net10-prepare-binderate-build
moljac Mar 18, 2025
d0e4031
script improvements
moljac Mar 19, 2025
56c6f60
nuget bumps
moljac Mar 19, 2025
974527b
Update build-android-libraries-net10-net8.cake
moljac Mar 19, 2025
7765622
nuget-install.cake
moljac Mar 20, 2025
f1e7cb1
indirect nuget installation
moljac Mar 21, 2025
010e23a
nuget install/uninstal traget added
moljac Mar 21, 2025
528cede
nuget extras install/uninstll fixes
moljac Mar 21, 2025
a661191
switched steps for unit tests and AL builds for net10
moljac Mar 22, 2025
b2fca9b
10.0.100-preview.2.25164.34
moljac Mar 22, 2025
2a57016
install dotnetNextVersion
moljac Mar 23, 2025
17e7c01
workloads added: android android-net8
moljac Mar 23, 2025
3b61c51
Revert "workloads added: android android-net8"
moljac Mar 23, 2025
4ae83fe
switch back to new approach for testing
moljac Mar 25, 2025
aaf2ace
refactoring + saving main build files
moljac Mar 25, 2025
2dcba48
build errors fixed
moljac Mar 25, 2025
f3c5800
Update NuGet.config
moljac Apr 1, 2025
4faa8e8
workload installation
moljac Apr 1, 2025
00051ff
cake.filehelpers added for windows
moljac Apr 2, 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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ tools/
.gradle
packages/
externals/
output/
output*/
Resource.designer.cs
generated/
generated*/

# User-specific files
*.suo
Expand Down
2 changes: 2 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>

<CheckEolWorkloads>false</CheckEolWorkloads>

Comment on lines +12 to +13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need this? Do you get a warning/error if you remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting warnings for net8.0 when built with net10.0

<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>

Expand Down
28 changes: 28 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-e7876a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-e7876a4f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-android-82d8938" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-82d8938c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- ensure only the sources defined below are used -->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<!-- This is for packages needed by debugger-libs -->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.11 -->
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
5 changes: 5 additions & 0 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#addin nuget:?package=SharpZipLib&version=1.4.2

// Imported scripts
#load "build/cake/nuget-install.cake"
#load "build/cake/setup-environment.cake"
#load "build/cake/update-config.cake"
#load "build/cake/tests.cake"
Expand All @@ -18,6 +19,8 @@
#load "build/cake/executive-order.cake"
#load "build/cake/clean.cake"
#load "build/cake/performance-timings.cake"
#load "build/cake/build-android-libraries-net10-net8.cake"
//#load "build/cake/build-android-libraries-net10-net8.initial.cake"

using System.Xml.Linq;
using Newtonsoft.Json;
Expand All @@ -43,6 +46,8 @@ Information ($"BUILD_COMMIT : {BUILD_COMMIT}");
Information ($"BUILD_NUMBER : {BUILD_NUMBER}");
Information ($"BUILD_TIMESTAMP : {BUILD_TIMESTAMP}");

RunTarget("nuget-install");

Task ("packages")
.IsDependentOn ("binderate")
.IsDependentOn ("nuget");
Expand Down
2 changes: 2 additions & 0 deletions build/cake/binderate.cake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Task ("binderate")
.IsDependentOn ("javadocs-gps")
.Does (() =>
{
EnsureDirectoryExists("./output");

var configFile = MakeAbsolute (new FilePath ("./config.json")).FullPath;
var basePath = MakeAbsolute (new DirectoryPath ("./")).FullPath;

Expand Down
24 changes: 24 additions & 0 deletions build/cake/build-and-package.cake
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,32 @@ Task ("nuget")
"./generated/AndroidX.sln",
new DotNetBuildSettings { MSBuildSettings = settings }
);

RunTarget("nuget-uninstall");

});

Task ("nuget-pack-without-build")
.Does
(
() =>
{
var settings = new DotNetMSBuildSettings ()
.SetConfiguration (CONFIGURATION)
.EnableBinaryLogger ($"./output/nuget-pack-without-build.{CONFIGURATION}.binlog")
.WithProperty ("NoBuild", "true")
.WithProperty ("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath)
.WithTarget ("Pack");

DotNetBuild
(
"./generated/AndroidX.sln",
new DotNetBuildSettings { MSBuildSettings = settings }
);
}
);


// Builds the .csproj projects
Task ("libs")
.IsDependentOn("metadata-verify")
Expand Down
Loading