Skip to content

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

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

Draft
wants to merge 74 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
96acffb
Update _PackageLevelCustomizations.cshtml
moljac Apr 2, 2025
9d7989f
metadata + Additions cleanup for net10.0
moljac Apr 2, 2025
58f3748
nuget.config from dotnet/android added
moljac Apr 2, 2025
6e13fb7
<CheckEolWorkloads>false</CheckEolWorkloads> needed to work around so…
moljac Apr 2, 2025
11420d4
Update build.cake
moljac Apr 2, 2025
332a5f9
bumping nugets + improvements
moljac Apr 2, 2025
d8578b2
Create nuget-install.cake
moljac Apr 2, 2025
78fb810
add fix for case when nuget install is necessary
moljac Apr 2, 2025
5ab2009
packaging without build added
moljac Apr 2, 2025
14f3237
net10 added
moljac Apr 2, 2025
df033df
fix typo
moljac Apr 2, 2025
586e7aa
CI for net10
moljac Apr 2, 2025
c0349dc
fixed metadata
moljac Apr 2, 2025
d2fd545
nuget bumps
moljac Apr 2, 2025
8749ea4
control for migration path added
moljac Apr 2, 2025
9825202
Create build-android-libraries-net10-net8.cake
moljac Apr 2, 2025
50fa6f6
Create build-android-libraries-net10-net8.initial.cake
moljac Apr 2, 2025
bdf9bfc
Update Metadata.xml
moljac Apr 2, 2025
443c85b
added Build build-android-libraries-net10-net8
moljac Apr 2, 2025
fad1341
Delete NuGet.config
moljac Apr 2, 2025
edd02b4
Update published-namespaces.txt
moljac Apr 3, 2025
74c3f83
Update .gitignore
moljac Apr 3, 2025
69053d7
excluded other steps for testing
moljac Apr 3, 2025
292a03d
CI workloads install
moljac Apr 3, 2025
b4a9af1
removed rollbackfile
moljac Apr 3, 2025
8d97ca0
don't run preview
moljac Apr 3, 2025
2063a8c
Update setup-environment.yml
moljac Apr 3, 2025
667be3e
global.json variant for CI installation
moljac Apr 3, 2025
13ea40d
Update setup-environment.yml
moljac Apr 3, 2025
f165dbf
typos fixed
moljac Apr 3, 2025
6f891c8
typos fixed
moljac Apr 3, 2025
7b6aefa
additionally install preview
moljac Apr 3, 2025
74fba92
workloads.json manipulation removed
moljac Apr 3, 2025
c06c93a
not preserving output
moljac Apr 4, 2025
ee9cbd8
skip net10 only builds
moljac Apr 4, 2025
8a28dfd
Update global.json
moljac Apr 7, 2025
df5c121
Update build-android-libraries-net10-net8.cake
moljac Apr 7, 2025
dd437ea
moving instead of copying to preserve disk space
moljac Apr 7, 2025
d0704c8
refactoring script
moljac Apr 7, 2025
8010b67
Update build-android-libraries-net10-net8.cake
moljac Apr 7, 2025
2df1d9f
Update build-android-libraries-net10-net8.cake
moljac Apr 8, 2025
0163a77
cleanup
moljac Apr 8, 2025
72ba9bf
output folder changed
moljac Apr 8, 2025
62a11eb
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 10, 2025
59ba782
bumps
moljac Apr 14, 2025
138b49b
downgraded dependency-only versions
moljac Apr 14, 2025
798f3e5
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 16, 2025
3df80b5
preview 3
moljac Apr 25, 2025
6846923
Update published-namespaces.txt
moljac Apr 25, 2025
48218d7
Update Metadata.xml
moljac Apr 25, 2025
f1b7881
typo fixed
moljac Apr 25, 2025
ccfbd8c
preview3
moljac Apr 25, 2025
1f436e7
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 25, 2025
c645e94
Install dotnet tools with DotNetCoreCLI task
pjcollins Apr 28, 2025
26034c3
Only install/use dotnet from known agent tool path
pjcollins Apr 28, 2025
bfd4a74
Revert dotnet/tool install changes
pjcollins Apr 28, 2025
175b2ed
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 28, 2025
c362ff3
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 29, 2025
9a1ec1a
merge confilcts
moljac Apr 30, 2025
a4af40e
Update variables.yml
moljac Apr 30, 2025
5aa78e9
Update cgmanifest.json
moljac Apr 30, 2025
08c51dd
Update artifact-list-with-versions.md
moljac Apr 30, 2025
a70feb7
version bumps
moljac Apr 30, 2025
699bd3d
Merge branch 'main' into dev/moljac/mu-20241209-net10-removal-of-gene…
moljac Apr 30, 2025
d624513
bump fix
moljac May 1, 2025
a628663
Create Google.Android.Material.AppBar.AppBarLayout.cs
moljac May 6, 2025
7f0fce3
fix for type erasure
moljac May 6, 2025
6df5792
Delete Google.Android.Material.AppBar.AppBarLayout.cs
moljac May 6, 2025
f32c7fe
timeoutInMinutes: 600
moljac May 8, 2025
b6f37d0
fix for windows runs
moljac May 8, 2025
8d9d1a1
excluding extra steps on MacOSX
moljac May 13, 2025
1655eb1
Update .gitignore
jonathanpeppers May 16, 2025
0f4a1ff
Provision `platforms/android-34`
jonathanpeppers May 16, 2025
ff7222a
Update Metadata.xml
jonathanpeppers May 16, 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
7 changes: 5 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 Expand Up @@ -443,3 +443,6 @@ lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

# android-libraries specific
data/timings/
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>

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

Expand Down
12 changes: 12 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,10 @@
#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"

// Migrate packages to net10
bool IsMigratingNet10 = false;

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

RunTarget("nuget-install");

if (IsMigratingNet10)
{
RunTarget("build-android-libraries-net10-net8");
}

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