Merge branch 'main' into dev/grendel/clr-host

* main:
  [CoreCLR] Add src/native/clr for CoreCLR hosting bits (#9778)
  [Xamarin.Android.Build.Tasks] move .NET 8 support to `android-net8` workload (#9785)

Author: grendello

.gdn/policheck/source.gdnsuppress

@@ -90,6 +90,17 @@
       "justification": "Matching against `aapt2` tool output.",
       "createdDate": "2025-02-05 11:48:04Z"
     },
+    "26d3e99b351de02627162b255b2513d833a0343a6f25064f35d7310eb07cf3ff": {
+      "signature": "26d3e99b351de02627162b255b2513d833a0343a6f25064f35d7310eb07cf3ff",
+      "alternativeSignatures": [
+        "d23c1bf667150310fd782f0ad92064dcf077226a64d9bf1dd6762ead152f7703"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "justification": "Reference to ffs(3) find first set bit function.",
+      "createdDate": "2025-02-10 19:44:17Z"
+    },
     "a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45": {
       "signature": "a5555a74b0e940543802a63a6465b4d965eff4f6c858552813df633186794c45",
       "alternativeSignatures": [

build-tools/create-packs/Directory.Build.targets

@@ -124,6 +124,7 @@
       <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" />
       <_PreviewPacks Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' " Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).*.nupkg" />
       <_InstallArguments Include="android" />
+      <_InstallArguments Include="android-net8" />
       <_InstallArguments Include="android-$(AndroidLatestUnstableApiLevel)" Condition=" '@(_PreviewPacks->Count())' != '0' " />
       <_InstallArguments Include="--skip-manifest-update" />
       <_InstallArguments Include="--skip-sign-check" />

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

@@ -6,7 +6,6 @@
       "packs": [
         "Microsoft.Android.Sdk.net10",
         "Microsoft.Android.Sdk.net9",
-        "Microsoft.Android.Sdk.net8",
         "Microsoft.Android.Ref.35",
         "Microsoft.Android.Runtime.Mono.35.android-arm",
         "Microsoft.Android.Runtime.Mono.35.android-arm64",
@@ -15,15 +14,23 @@
         "Microsoft.Android.Templates"
       ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],
-      "extends" : [ 
-        "microsoft-net-runtime-android-net8",
-        "microsoft-net-runtime-android-aot-net8",
+      "extends" : [
         "microsoft-net-runtime-android-net9",
         "microsoft-net-runtime-android-aot-net9",
         "microsoft-net-runtime-android",
         "microsoft-net-runtime-android-aot"
       ]
     },
+    "android-net8": {
+      "description": ".NET SDK Workload for building .NET 8 Android applications.",
+      "packs": [ "Microsoft.Android.Sdk.net8" ],
+      "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],
+      "extends" : [
+        "android",
+        "microsoft-net-runtime-android-net8",
+        "microsoft-net-runtime-android-aot-net8"
+      ]
+    },
     "android-36": {
       "description": "Preview support for Android API-36.",
       "packs": [

src/native/CMakeLists.txt

@@ -239,6 +239,9 @@ else()
   include_directories(mono)
 endif()
 
+include_directories(common/include)
+include_directories(mono)
+
 #
 # Compiler defines
 #