Skip to content

[DO NOT MERGE] Manual updates 20250328 net10 and net8 build to investigate nuget restore issue android21 #1116

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

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
12f48eb
cake scripts
moljac Mar 29, 2025
4db86d1
Update .gitignore
moljac Mar 29, 2025
7a4ec85
ci scripts
moljac Mar 29, 2025
cd88fff
Update Directory.Build.props
moljac Mar 29, 2025
ad627f3
Update artifact-list-with-versions.md
moljac Mar 29, 2025
d3ba9ac
tests
moljac Mar 29, 2025
104b600
Update utilities.cake
moljac Mar 29, 2025
ccf8043
Update workloads.json
moljac Mar 29, 2025
4775e1e
source (metadata and managed code)
moljac Mar 29, 2025
20bee2e
Update global.json
moljac Mar 29, 2025
c6fd40c
Create NuGet.config
moljac Mar 29, 2025
c3ad580
Update published-namespaces.txt
moljac Mar 29, 2025
739fa91
generated code
moljac Mar 29, 2025
8441a66
generated added
moljac Mar 30, 2025
3afd065
dotnet install android android-net8
moljac Mar 30, 2025
45df92f
android-net8 workload addded
moljac Mar 30, 2025
1596ed3
net10.0 fixes
moljac Mar 31, 2025
18ff2aa
Update AndroidX.sln
moljac Mar 31, 2025
46e6d9e
newer feeds added
moljac Mar 31, 2025
9826c37
Update NuGet.config
moljac Mar 31, 2025
71431e1
Update setup-environment.yml
moljac Mar 31, 2025
9c6c87a
removed rollbackfile
moljac Apr 1, 2025
7f49d70
trying again with 10.0.100-preview.2.25164.34
moljac Apr 1, 2025
52aba8b
NuGet.config for tests
moljac Apr 1, 2025
4d3b22c
Update setup-environment.yml
moljac Apr 1, 2025
3dae5a7
workload install split into 2 steps + added workload update
moljac Apr 1, 2025
238cfac
typo fixed
moljac Apr 1, 2025
8015995
Update setup-environment.yml
moljac Apr 1, 2025
2f4b838
Update setup-environment.yml
moljac Apr 1, 2025
deab20f
order of steps changed
moljac Apr 1, 2025
da6779f
removed Build build-android-libraries-net10-net8
moljac Apr 1, 2025
e9b8342
cake.filehelpers added for windows
moljac Apr 2, 2025
9690d90
.NET 8
moljac Apr 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
15 changes: 10 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>

<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
<_DefaultTargetFrameworks>net8.0-android;net10.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0;net10.0</_DefaultNetTargetFrameworks>

<CheckEolWorkloads>false</CheckEolWorkloads>

<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
Expand Down Expand Up @@ -83,13 +85,16 @@

<!-- Folders that .targets files need to go into -->
<ItemGroup>
<AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="build\net10.0-android35.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net10.0-android35.0" />
</ItemGroup>

<!-- Folders that _._ files need to go into for packages without managed libraries -->
<ItemGroup>
<AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
<AndroidXNuGetLibFolders Include="lib\\net8.0-android34.0" />
<AndroidXNuGetLibFolders Include="lib\\net10.0-android35.0" />
</ItemGroup>

<ItemGroup>
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
Loading