diff --git a/Configuration.props b/Configuration.props
index f485f865154..5c43fa58459 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -38,7 +38,7 @@
     <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">Tiramisu</AndroidLatestUnstablePlatformId>
     <AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v12.1.99</AndroidLatestUnstableFrameworkVersion>
     <!-- The default API level used for $(TargetPlatformVersion) -->
-    <AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">31</AndroidDefaultTargetDotnetApiLevel>
+    <AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">32</AndroidDefaultTargetDotnetApiLevel>
     <!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
     <AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidApiLevel>
     <AndroidPlatformId Condition=" '$(AndroidPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidPlatformId>
diff --git a/Directory.Build.props b/Directory.Build.props
index 59b44ec08b0..4ec9ed53c35 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <DotNetTargetFrameworkVersion>6.0</DotNetTargetFrameworkVersion>
+    <DotNetTargetFrameworkVersion>7.0</DotNetTargetFrameworkVersion>
     <DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
     <DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
     <!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
diff --git a/NuGet.config b/NuGet.config
index 2fb928fa180..c7b1ee54057 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,17 +2,10 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-emsdk -->
-    <!--  End: Package sources from dotnet-emsdk -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-a21b9a2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--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" />
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/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" />
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 92348ec3022..35e7c11b8c4 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -53,8 +53,9 @@ variables:
   value: $[and(ne(variables['System.PullRequest.IsFork'], 'True'), or(contains(variables['Build.SourceBranchName'], 'mono-'), contains(variables['System.PullRequest.SourceBranch'], 'mono-')))]
 - name: RunAllTests
   value: $[or(eq(variables['XA.RunAllTests'], true), eq(variables['IsMonoBranch'], true))]
+  # XamarinBuildDownload disabled, due to: https://github.com/dotnet/runtime/issues/68734
 - name: DotNetNUnitCategories
-  value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication'
+  value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication & TestCategory != XamarinBuildDownload'
 - ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}:
   - group: AzureDevOps-Artifact-Feeds-Pats
   - group: DotNet-MSRC-Storage
@@ -697,6 +698,8 @@ stages:
 
     - template: yaml-templates/apk-instrumentation.yaml
       parameters:
+        # TODO: disable LLVM test, see: https://github.com/dotnet/runtime/issues/68914
+        condition: false
         configuration: $(XA.Build.Configuration)
         testName: Mono.Android.NET_Tests-AotLlvm
         project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
@@ -1434,7 +1437,9 @@ stages:
         packagesToPush: $(Build.StagingDirectory)\nuget-signed\*.nupkg
         nuGetFeedType: external
         publishFeedCredentials: $(DotNetFeedCredential)
-      condition: and(succeeded(), eq(variables['PushXAPackages'], 'true'))
+      condition: false
+      # NET7TODO: Enable once we have access to the dnceng-dotnet7 feed.
+      #condition: and(succeeded(), eq(variables['PushXAPackages'], 'true'))
 
     - template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
       parameters:
diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
index cd0d8f2b3f5..f974b0c0c4d 100644
--- a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
+++ b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
@@ -26,10 +26,15 @@ jobs:
 
     - template: clean.yaml
 
+    # Install a stable verison of .NET for classic tests
+    - template: use-dot-net.yaml
+      parameters:
+        version: 6.0.202
+        remove_dotnet: true
+
     - template: setup-test-environment.yaml
       parameters:
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
-        remove_dotnet: true
 
     - task: DownloadPipelineArtifact@1
       inputs:
diff --git a/build-tools/automation/yaml-templates/use-dot-net.yaml b/build-tools/automation/yaml-templates/use-dot-net.yaml
index 3dd00128d92..159bcc97382 100644
--- a/build-tools/automation/yaml-templates/use-dot-net.yaml
+++ b/build-tools/automation/yaml-templates/use-dot-net.yaml
@@ -2,7 +2,7 @@
 # We prefer this over the UseDotNet task so that we can always clean up old/unstable versions on disk.
 
 parameters:
-  version: $(DotNet6Version)
+  version: $(DotNetSdkVersion)
   remove_dotnet: false
 
 steps:
diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
index 2fdc531b700..376f5a881ac 100644
--- a/build-tools/automation/yaml-templates/variables.yaml
+++ b/build-tools/automation/yaml-templates/variables.yaml
@@ -17,8 +17,8 @@ variables:
   value: 3.11.1
 - name: NUnit.NumberOfTestWorkers
   value: 4
-- name: DotNet6Version
-  value: 6.0.100
+- name: DotNetSdkVersion
+  value: 7.0.100-preview.2.22153.17
 - name: GitHub.Token
   value: $(github--pat--vs-mobiletools-engineering-service2)
 - name: HostedMacImage
@@ -32,6 +32,6 @@ variables:
 - name: TeamName
   value: XamarinAndroid
 - name: DotNetTargetFramework
-  value: net6.0
+  value: net7.0
 - name: DotNetStableTargetFramework
   value: net6.0
diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 4b0f7262f61..e4861162752 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -95,7 +95,7 @@
       <_WLManifest Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.NET.Sdk.Android.Manifest-*.nupkg" />
     </ItemGroup>
     <PropertyGroup>
-      <_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand).', ''))</_WLPackVersion>
+      <_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Sdk.Android.Manifest-$(DotNetAndroidManifestVersionBand).', ''))</_WLPackVersion>
       <_SdkManifestsFolder>$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\</_SdkManifestsFolder>
     </PropertyGroup>
     <Unzip
diff --git a/build-tools/create-packs/Microsoft.Android.Ref.proj b/build-tools/create-packs/Microsoft.Android.Ref.proj
index 77a4ae3f7ba..3fb2ef94211 100644
--- a/build-tools/create-packs/Microsoft.Android.Ref.proj
+++ b/build-tools/create-packs/Microsoft.Android.Ref.proj
@@ -31,6 +31,7 @@ by projects that use the Microsoft.Android framework in .NET 5.
     </PropertyGroup>
 
     <ItemGroup>
+      <!-- TODO: build Java.Interop.dll for .NET 7 -->
       <_AndroidRefPackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net6.0\ref\Java.Interop.dll" />
       <_AndroidRefPackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidApiLevel)\ref\Mono.Android.dll" />
       <!-- Always include stable Mono.Android.Export.dll -->
diff --git a/build-tools/create-packs/Microsoft.Android.Runtime.proj b/build-tools/create-packs/Microsoft.Android.Runtime.proj
index 06f2b653523..4f92b5d87bd 100644
--- a/build-tools/create-packs/Microsoft.Android.Runtime.proj
+++ b/build-tools/create-packs/Microsoft.Android.Runtime.proj
@@ -34,6 +34,7 @@ projects that use the Microsoft.Android framework in .NET 5.
     </PropertyGroup>
 
     <ItemGroup>
+      <!-- TODO: build Java.Interop.dll for .NET 7 -->
       <_AndroidRuntimePackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net6.0\Java.Interop.dll" />
       <_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidApiLevel)\Mono.Android.dll" />
       <!-- Always include stable Mono.Android.Export.dll -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8a717674842..1e1e8c0bc5b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,20 +1,20 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300-rtm.22214.7">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.4.22174.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>04e40fa940291c528688bb46a1aa0e6efdbab7cf</Sha>
+      <Sha>c7afae6936bf80239aa93bfd3b6f68513d9876d4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22173.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>01c4f5905959c29f86781b85187bb676fc517ee9</Sha>
+      <Sha>04c49c9d7c244d7c73d6dbb438c4885fa72e830b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22172.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a21b9a2dd4c31cf5bd37626562b7612faf21cee6</Sha>
+      <Sha>c5d40c9e703fd257db1b26ef4fd1399bbae73ab0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.3.22121.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
+      <Sha>b8e71431b3eaa024afad7886699f8ac6bca2ba01</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 05bcba3fe86..7feef038fa6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,13 +1,13 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.300-rtm.22214.7</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22178.2</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.4.22174.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22173.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
-    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.3.22121.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
+    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Match the first three version numbers and append 00 -->
diff --git a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj
index 2cf3b2f456a..cc53c7b8326 100644
--- a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj
+++ b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net7.0-android</TargetFramework>
     <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidBinding1</RootNamespace>
     <Nullable>enable</Nullable>
diff --git a/src/Microsoft.Android.Templates/android/AndroidApp1.csproj b/src/Microsoft.Android.Templates/android/AndroidApp1.csproj
index 16f9ea6f3e5..ffe09512dde 100644
--- a/src/Microsoft.Android.Templates/android/AndroidApp1.csproj
+++ b/src/Microsoft.Android.Templates/android/AndroidApp1.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net7.0-android</TargetFramework>
     <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
     <OutputType>Exe</OutputType>
diff --git a/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj b/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj
index 46aa993fc7f..787e6f8939b 100644
--- a/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj
+++ b/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net7.0-android</TargetFramework>
     <SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
     <Nullable>enable</Nullable>
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/in/Microsoft.Android.Sdk.BundledVersions.in.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/in/Microsoft.Android.Sdk.BundledVersions.in.targets
index 0e9a59e25e2..a6c3c177066 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/in/Microsoft.Android.Sdk.BundledVersions.in.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/in/Microsoft.Android.Sdk.BundledVersions.in.targets
@@ -17,6 +17,18 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <_AndroidRuntimePackId Condition=" '$(_AndroidRuntimePackId)' == '' ">$(_AndroidTargetingPackId)</_AndroidRuntimePackId>
   </PropertyGroup>
   <ItemGroup>
+    <!-- TODO: NET7TODO: Is this the right way to support building net6.0 projects? Need to bump versions as packages are release to NuGet.org as well -->
+    <KnownFrameworkReference
+        Include="Microsoft.Android"
+        TargetFramework="net6.0"
+        RuntimeFrameworkName="Microsoft.Android"
+        LatestRuntimeFrameworkVersion="32.0.300-rc.1.4"
+        TargetingPackName="Microsoft.Android.Ref.$(_AndroidTargetingPackId)"
+        TargetingPackVersion="32.0.300-rc.1.4"
+        RuntimePackNamePatterns="Microsoft.Android.Runtime.$(_AndroidRuntimePackId).**RID**"
+        RuntimePackRuntimeIdentifiers="android-arm;android-arm64;android-x86;android-x64"
+        Profile="Android"
+    />
     <KnownFrameworkReference
         Include="Microsoft.Android"
         TargetFramework="@DOTNET_TARGET_FRAMEWORK@"
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
index 8bcdb7f64b3..67d1bbba119 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets
@@ -14,6 +14,7 @@ This file contains the .NET 5-specific targets to customize ILLink
       AfterTargets="ComputeResolvedFilesToPublishList"
       DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache">
     <PropertyGroup>
+      <TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
       <!--
         Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
         https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
index ad29fdd0746..4208a0d168e 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json
@@ -5,7 +5,6 @@
       "description": ".NET SDK Workload for building Android applications.",
       "packs": [
         "Microsoft.Android.Sdk",
-        "Microsoft.Android.Ref.31",
         "Microsoft.Android.Ref.32",
         "Microsoft.Android.Runtime.32.android-arm",
         "Microsoft.Android.Runtime.32.android-arm64",
@@ -41,10 +40,6 @@
         "linux-x64": "Microsoft.Android.Sdk.Linux"
       }
     },
-    "Microsoft.Android.Ref.31": {
-      "kind": "framework",
-      "version": "@WORKLOAD_VERSION@"
-    },
     "Microsoft.Android.Ref.32": {
       "kind": "framework",
       "version": "@WORKLOAD_VERSION@"
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
index 329eed3838c..6858b962cae 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
@@ -256,6 +256,7 @@ public void RepetiviteBuildUpdateSingleResource ([Values (false, true)] bool use
 		}
 
 		[Test]
+		[Category ("XamarinBuildDownload")]
 		[NonParallelizable]
 		public void Check9PatchFilesAreProcessed ()
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
index 5b7e29ce5e2..2a63c9c4fa8 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
@@ -296,7 +296,7 @@ public void BuildAotApplicationAndBundleAndÜmläüts (string supportedAbis, boo
 
 		[Test]
 		[NonParallelizable]
-		[Category ("SmokeTests")]
+		[Category ("SmokeTests"), Category ("XamarinBuildDownload")]
 		public void BuildAMassiveApp ()
 		{
 			var testPath = Path.Combine ("temp", "BuildAMassiveApp");
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
index 7a8fdb178ea..73ca8c93c53 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -551,6 +551,7 @@ public void ApplicationIdPlaceholder ()
 		}
 
 		[Test]
+		[Category ("XamarinBuildDownload")]
 		public void ExtraAaptManifest ()
 		{
 			var proj = new XamarinAndroidApplicationProject ();
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index ca90c4fbd67..060b9d49832 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -423,7 +423,7 @@ public void DuplicateRJavaOutput ()
 		}
 
 		[Test]
-		[Category ("SmokeTests")]
+		[Category ("SmokeTests"), Category ("XamarinBuildDownload")]
 		[NonParallelizable] // parallel NuGet restore causes failures
 		public void BuildXamarinFormsMapsApplication ([Values (true, false)] bool multidex)
 		{
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
index 1df648ddffe..fc45875c5ac 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
@@ -90,7 +90,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
 					"rc.bin",
 					"System.Private.CoreLib.dll",
 					"System.Runtime.dll",
-					"System.Runtime.CompilerServices.Unsafe.dll",
 					"System.Linq.dll",
 					"UnnamedProject.dll",
 				} :
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
index fbd159dcb8c..50c189c23f9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
@@ -227,6 +227,16 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib")]
 				$"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}",
 				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
 			},
+			new object[] {
+				"net7.0",
+				"android",
+				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
+			},
+			new object[] {
+				"net7.0",
+				$"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}",
+				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
+			},
 		};
 
 		[Test]
@@ -241,7 +251,11 @@ public void DotNetPack (string dotnetVersion, string platform, int apiLevel)
 					new BuildItem.Source ("Foo.cs") {
 						TextContent = () => "public class Foo { }",
 					}
-				}
+				},
+				ExtraNuGetConfigSources = {
+					// Projects targeting net6.0 require ref/runtime packs on NuGet.org
+					"https://api.nuget.org/v3/index.json",
+				},
 			};
 			if (IsPreviewFrameworkVersion (targetFramework)) {
 				proj.SetProperty ("EnablePreviewFeatures", "true");
@@ -702,18 +716,24 @@ public void DotNetBuildXamarinForms ([Values (true, false)] bool useInterpreter)
 				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
 			},
 			new object[] {
-				"net6.0",
+				"net7.0",
+				"android",
+				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
+			},
+
+			new object[] {
+				"net7.0",
 				$"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}",
 				XABuildConfig.AndroidDefaultTargetDotnetApiLevel,
 			},
 
 			new object[] {
-				"net6.0",
+				"net7.0",
 				XABuildConfig.AndroidLatestStableApiLevel == XABuildConfig.AndroidDefaultTargetDotnetApiLevel ? null : $"android{XABuildConfig.AndroidLatestStableApiLevel}.0",
 				XABuildConfig.AndroidLatestStableApiLevel,
 			},
 			new object[] {
-				"net6.0",
+				"net7.0",
 				XABuildConfig.AndroidLatestUnstableApiLevel == XABuildConfig.AndroidLatestStableApiLevel ? null : $"android{XABuildConfig.AndroidLatestUnstableApiLevel}.0",
 				XABuildConfig.AndroidLatestUnstableApiLevel,
 			},
@@ -739,7 +759,11 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n
 			const string runtimeIdentifier = "android-arm";
 			var proj = new XASdkProject {
 				TargetFramework = targetFramework,
-				IsRelease = isRelease
+				IsRelease = isRelease,
+				ExtraNuGetConfigSources = {
+					// Projects targeting net6.0 require ref/runtime packs on NuGet.org
+					"https://api.nuget.org/v3/index.json",
+				},
 			};
 			proj.SetProperty (KnownProperties.RuntimeIdentifier, runtimeIdentifier);
 
@@ -755,14 +779,16 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n
 				dotnet.AssertHasNoWarnings ();
 			}
 
-			var refDirectory = Directory.GetDirectories (Path.Combine (AndroidSdkResolver.GetDotNetPreviewPath (), "packs", $"Microsoft.Android.Ref.{apiLevel}")).LastOrDefault ();
-			var expectedMonoAndroidRefPath = Path.Combine (refDirectory, "ref", dotnetVersion, "Mono.Android.dll");
-			Assert.IsTrue (dotnet.LastBuildOutput.ContainsText (expectedMonoAndroidRefPath), $"Build should be using {expectedMonoAndroidRefPath}");
+			if (dotnetVersion != "net6.0") {
+				var refDirectory = Directory.GetDirectories (Path.Combine (AndroidSdkResolver.GetDotNetPreviewPath (), "packs", $"Microsoft.Android.Ref.{apiLevel}")).LastOrDefault ();
+				var expectedMonoAndroidRefPath = Path.Combine (refDirectory, "ref", dotnetVersion, "Mono.Android.dll");
+				Assert.IsTrue (dotnet.LastBuildOutput.ContainsText (expectedMonoAndroidRefPath), $"Build should be using {expectedMonoAndroidRefPath}");
 
-			var runtimeApiLevel = (apiLevel == XABuildConfig.AndroidDefaultTargetDotnetApiLevel && apiLevel < XABuildConfig.AndroidLatestStableApiLevel) ? XABuildConfig.AndroidLatestStableApiLevel : apiLevel;
-			var runtimeDirectory = Directory.GetDirectories (Path.Combine (AndroidSdkResolver.GetDotNetPreviewPath (), "packs", $"Microsoft.Android.Runtime.{runtimeApiLevel}.{runtimeIdentifier}")).LastOrDefault ();
-			var expectedMonoAndroidRuntimePath = Path.Combine (runtimeDirectory, "runtimes", runtimeIdentifier, "lib", dotnetVersion, "Mono.Android.dll");
-			Assert.IsTrue (dotnet.LastBuildOutput.ContainsText (expectedMonoAndroidRuntimePath), $"Build should be using {expectedMonoAndroidRuntimePath}");
+				var runtimeApiLevel = (apiLevel == XABuildConfig.AndroidDefaultTargetDotnetApiLevel && apiLevel < XABuildConfig.AndroidLatestStableApiLevel) ? XABuildConfig.AndroidLatestStableApiLevel : apiLevel;
+				var runtimeDirectory = Directory.GetDirectories (Path.Combine (AndroidSdkResolver.GetDotNetPreviewPath (), "packs", $"Microsoft.Android.Runtime.{runtimeApiLevel}.{runtimeIdentifier}")).LastOrDefault ();
+				var expectedMonoAndroidRuntimePath = Path.Combine (runtimeDirectory, "runtimes", runtimeIdentifier, "lib", dotnetVersion, "Mono.Android.dll");
+				Assert.IsTrue (dotnet.LastBuildOutput.ContainsText (expectedMonoAndroidRuntimePath), $"Build should be using {expectedMonoAndroidRuntimePath}");
+			}
 
 			var publishDirectory = Path.Combine (FullProjectDirectory, proj.OutputPath, runtimeIdentifier, "publish");
 			var apk = Path.Combine (publishDirectory, $"{proj.PackageName}.apk");
@@ -819,7 +845,7 @@ void CreateEmptyFile (params string [] paths)
 		}
 
 		[Test]
-		public void XamarinLegacySdk ([Values ("net6.0")] string dotnetVersion)
+		public void XamarinLegacySdk ([Values ("net6.0", "net7.0")] string dotnetVersion)
 		{
 			var proj = new XASdkProject (outputType: "Library") {
 				Sdk = "Xamarin.Legacy.Sdk/0.1.0-alpha4",
@@ -827,7 +853,11 @@ public void XamarinLegacySdk ([Values ("net6.0")] string dotnetVersion)
 					new AndroidItem.AndroidLibrary ("javaclasses.jar") {
 						BinaryContent = () => ResourceData.JavaSourceJarTestJar,
 					}
-				}
+				},
+				ExtraNuGetConfigSources = {
+					// Projects targeting net6.0 require ref/runtime packs on NuGet.org
+					"https://api.nuget.org/v3/index.json",
+				},
 			};
 
 			using var b = new Builder ();
@@ -857,6 +887,10 @@ public void MauiTargetFramework (string dotnetVersion, string platform, int apiL
 			var targetFramework = $"{dotnetVersion}-{platform}";
 			var library = new XASdkProject (outputType: "Library") {
 				TargetFramework = targetFramework,
+				ExtraNuGetConfigSources = {
+					// Projects targeting net6.0 require ref/runtime packs on NuGet.org
+					"https://api.nuget.org/v3/index.json",
+				},
 			};
 
 			var preview = IsPreviewFrameworkVersion (targetFramework);
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
index 623a21df08d..a9d5b2703ac 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
@@ -55,7 +55,7 @@ public static void SaveNuGetConfig (string directory)
 		public XASdkProject (string outputType = "Exe", [CallerMemberName] string packageName = "")
 		{
 			Sdk = "Microsoft.NET.Sdk";
-			TargetFramework = "net6.0-android";
+			TargetFramework = "net7.0-android";
 			SupportedOSPlatformVersion = "21";
 			PackageName = $"com.xamarin.{(packageName ?? ProjectName).ToLower ()}";
 			JavaPackageName = JavaPackageName ?? PackageName.ToLowerInvariant ();
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs
index 198e551aa67..223511d6364 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs
@@ -26,7 +26,7 @@ protected DotNetXamarinProject (string debugConfigurationName = "Debug", string
 			SetProperty ("AssemblyName", () => AssemblyName ?? ProjectName);
 
 			if (Builder.UseDotNet) {
-				SetProperty ("TargetFramework", "net6.0-android");
+				SetProperty ("TargetFramework", "net7.0-android");
 				SetProperty ("EnableDefaultItems", "false");
 				SetProperty ("AppendTargetFrameworkToOutputPath", "false");
 			} else {
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
index 9241bfb146b..c378ceeca51 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
@@ -445,7 +445,7 @@ public void CopyNuGetConfig (string relativeDirectory)
 
 		/// <summary>
 		/// Updates a NuGet.config based on sources in ExtraNuGetConfigSources
-		/// Removes the dotnet6 source, which should not be needed by tests
+		/// The dotnet7 source is required while in preview, but eventually it should not be needed by tests
 		/// </summary>
 		protected void AddNuGetConfigSources (XDocument doc)
 		{
@@ -455,14 +455,14 @@ protected void AddNuGetConfigSources (XDocument doc)
 				doc.Root.Add (pkgSourcesElement= new XElement (elementName));
 			}
 
-			// Remove dotnet6 feed
+			/* NET7TODO: Remove dotnet7 feed
 			foreach (XElement element in pkgSourcesElement.Elements ()) {
 				XAttribute value = element.Attribute ("value");
-				if (value != null && value.Value == "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json") {
+				if (value != null && value.Value == "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json") {
 					element.Remove ();
 					break;
 				}
-			}
+			} */
 
 			// Add extra sources
 			if (ExtraNuGetConfigSources == null)
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
index 11037595fc9..d99ea55ff7f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,61 +5,58 @@
       "Size": 3032
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 55099
+      "Size": 54979
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 88852
+      "Size": 88930
     },
     "assemblies/rc.bin": {
       "Size": 1083
     },
     "assemblies/System.Linq.dll": {
-      "Size": 10112
+      "Size": 10111
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 519255
-    },
-    "assemblies/System.Runtime.CompilerServices.Unsafe.dll": {
-      "Size": 1165
+      "Size": 537771
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2369
+      "Size": 2415
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 3543
+      "Size": 3553
     },
     "classes.dex": {
-      "Size": 344840
+      "Size": 347336
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 382480
+      "Size": 382272
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3176080
+      "Size": 4693664
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
-      "Size": 776216
+      "Size": 767264
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 84064
+      "Size": 88288
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 150032
+      "Size": 146816
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 9328
+      "Size": 9272
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 2594
+      "Size": 2469
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 2467
+      "Size": 2342
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4791
+      "Size": 4762
     },
     "res/drawable-mdpi-v4/icon.png": {
       "Size": 2200
@@ -83,5 +80,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2705399
+  "PackageSize": 2987924
 }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
index aab3f1b77d5..6aa7d9e3764 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -5,184 +5,178 @@
       "Size": 3568
     },
     "assemblies/FormsViewGroup.dll": {
-      "Size": 7240
+      "Size": 7114
     },
     "assemblies/Java.Interop.dll": {
-      "Size": 62048
+      "Size": 61933
     },
     "assemblies/Mono.Android.dll": {
-      "Size": 445340
+      "Size": 445196
     },
     "assemblies/mscorlib.dll": {
-      "Size": 3799
+      "Size": 3892
     },
     "assemblies/netstandard.dll": {
-      "Size": 5498
+      "Size": 5603
     },
     "assemblies/rc.bin": {
       "Size": 1083
     },
     "assemblies/System.Collections.Concurrent.dll": {
-      "Size": 11226
+      "Size": 11440
     },
     "assemblies/System.Collections.dll": {
-      "Size": 16734
+      "Size": 16972
     },
     "assemblies/System.Collections.NonGeneric.dll": {
-      "Size": 8434
+      "Size": 8518
     },
     "assemblies/System.ComponentModel.dll": {
-      "Size": 1960
+      "Size": 2018
     },
     "assemblies/System.ComponentModel.Primitives.dll": {
-      "Size": 2563
+      "Size": 2729
     },
     "assemblies/System.ComponentModel.TypeConverter.dll": {
-      "Size": 5967
+      "Size": 6183
     },
     "assemblies/System.Console.dll": {
-      "Size": 6526
+      "Size": 6955
     },
     "assemblies/System.Core.dll": {
-      "Size": 1928
+      "Size": 2059
     },
     "assemblies/System.Diagnostics.TraceSource.dll": {
-      "Size": 6754
+      "Size": 6939
     },
     "assemblies/System.dll": {
-      "Size": 2274
+      "Size": 2415
     },
     "assemblies/System.Drawing.dll": {
-      "Size": 1956
+      "Size": 2097
     },
     "assemblies/System.Drawing.Primitives.dll": {
-      "Size": 12197
+      "Size": 12257
     },
     "assemblies/System.IO.Compression.dll": {
-      "Size": 17215
+      "Size": 17346
     },
     "assemblies/System.IO.IsolatedStorage.dll": {
-      "Size": 10568
+      "Size": 10469
     },
     "assemblies/System.Linq.dll": {
-      "Size": 19471
+      "Size": 19935
     },
     "assemblies/System.Linq.Expressions.dll": {
-      "Size": 182073
+      "Size": 182164
     },
     "assemblies/System.Net.Http.dll": {
-      "Size": 65836
+      "Size": 66181
     },
     "assemblies/System.Net.Primitives.dll": {
-      "Size": 22364
+      "Size": 22518
     },
     "assemblies/System.Net.Requests.dll": {
-      "Size": 3728
+      "Size": 3664
     },
     "assemblies/System.ObjectModel.dll": {
-      "Size": 11967
+      "Size": 9137
     },
     "assemblies/System.Private.CoreLib.dll": {
-      "Size": 757481
+      "Size": 778570
     },
     "assemblies/System.Private.DataContractSerialization.dll": {
-      "Size": 191077
+      "Size": 192732
     },
     "assemblies/System.Private.Uri.dll": {
-      "Size": 43498
+      "Size": 43511
     },
     "assemblies/System.Private.Xml.dll": {
-      "Size": 220179
+      "Size": 222925
     },
     "assemblies/System.Private.Xml.Linq.dll": {
-      "Size": 17093
-    },
-    "assemblies/System.Runtime.CompilerServices.Unsafe.dll": {
-      "Size": 1216
+      "Size": 17268
     },
     "assemblies/System.Runtime.dll": {
-      "Size": 2557
+      "Size": 2605
     },
     "assemblies/System.Runtime.Serialization.dll": {
-      "Size": 1890
+      "Size": 2024
     },
     "assemblies/System.Runtime.Serialization.Formatters.dll": {
-      "Size": 2630
+      "Size": 2672
     },
     "assemblies/System.Runtime.Serialization.Primitives.dll": {
-      "Size": 3938
-    },
-    "assemblies/System.Security.Cryptography.Algorithms.dll": {
-      "Size": 6810
+      "Size": 3988
     },
-    "assemblies/System.Security.Cryptography.Primitives.dll": {
-      "Size": 2967
+    "assemblies/System.Security.Cryptography.dll": {
+      "Size": 8048
     },
     "assemblies/System.Text.RegularExpressions.dll": {
-      "Size": 76701
+      "Size": 206070
     },
     "assemblies/System.Xml.dll": {
-      "Size": 1781
+      "Size": 1914
     },
     "assemblies/UnnamedProject.dll": {
-      "Size": 117235
+      "Size": 117242
     },
     "assemblies/Xamarin.AndroidX.Activity.dll": {
-      "Size": 6068
+      "Size": 5942
     },
     "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": {
-      "Size": 6091
+      "Size": 5965
     },
     "assemblies/Xamarin.AndroidX.AppCompat.dll": {
-      "Size": 112585
+      "Size": 112444
     },
     "assemblies/Xamarin.AndroidX.CardView.dll": {
-      "Size": 6804
+      "Size": 6683
     },
     "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": {
-      "Size": 16599
+      "Size": 16474
     },
     "assemblies/Xamarin.AndroidX.Core.dll": {
-      "Size": 96714
+      "Size": 96576
     },
     "assemblies/Xamarin.AndroidX.DrawerLayout.dll": {
-      "Size": 14267
+      "Size": 14137
     },
     "assemblies/Xamarin.AndroidX.Fragment.dll": {
-      "Size": 39925
+      "Size": 39795
     },
     "assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": {
-      "Size": 6130
+      "Size": 5997
     },
     "assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": {
-      "Size": 6588
+      "Size": 6465
     },
     "assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": {
-      "Size": 6668
+      "Size": 6539
     },
     "assemblies/Xamarin.AndroidX.Lifecycle.ViewModel.dll": {
-      "Size": 3269
+      "Size": 3140
     },
     "assemblies/Xamarin.AndroidX.Loader.dll": {
-      "Size": 12666
+      "Size": 12540
     },
     "assemblies/Xamarin.AndroidX.RecyclerView.dll": {
-      "Size": 84678
+      "Size": 84553
     },
     "assemblies/Xamarin.AndroidX.SavedState.dll": {
-      "Size": 5074
+      "Size": 4944
     },
     "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": {
-      "Size": 10375
+      "Size": 10254
     },
     "assemblies/Xamarin.AndroidX.ViewPager.dll": {
-      "Size": 17982
+      "Size": 17853
     },
     "assemblies/Xamarin.Forms.Core.dll": {
       "Size": 528450
     },
     "assemblies/Xamarin.Forms.Platform.Android.dll": {
-      "Size": 384995
+      "Size": 384800
     },
     "assemblies/Xamarin.Forms.Platform.dll": {
       "Size": 56878
@@ -191,28 +185,28 @@
       "Size": 60774
     },
     "assemblies/Xamarin.Google.Android.Material.dll": {
-      "Size": 40129
+      "Size": 40005
     },
     "classes.dex": {
-      "Size": 3457504
+      "Size": 3460008
     },
     "lib/arm64-v8a/libmonodroid.so": {
-      "Size": 382480
+      "Size": 382272
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3176080
+      "Size": 4693664
     },
     "lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
-      "Size": 776216
+      "Size": 767264
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 84064
+      "Size": 88288
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 150032
+      "Size": 146816
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 98640
+      "Size": 98480
     },
     "META-INF/android.support.design_material.version": {
       "Size": 12
@@ -326,13 +320,13 @@
       "Size": 1213
     },
     "META-INF/BNDLTOOL.SF": {
-      "Size": 79019
+      "Size": 78757
     },
     "META-INF/com.google.android.material_material.version": {
       "Size": 10
     },
     "META-INF/MANIFEST.MF": {
-      "Size": 78892
+      "Size": 78630
     },
     "META-INF/proguard/androidx-annotations.pro": {
       "Size": 339
@@ -779,7 +773,7 @@
       "Size": 470
     },
     "res/drawable-hdpi-v4/icon.png": {
-      "Size": 4791
+      "Size": 4762
     },
     "res/drawable-hdpi-v4/notification_bg_low_normal.9.png": {
       "Size": 212
@@ -1967,5 +1961,5 @@
       "Size": 341228
     }
   },
-  "PackageSize": 7942687
+  "PackageSize": 8360269
 }
\ No newline at end of file
diff --git a/src/monodroid/jni/embedded-assemblies.cc b/src/monodroid/jni/embedded-assemblies.cc
index cd842cd54ac..bd460ab5c16 100644
--- a/src/monodroid/jni/embedded-assemblies.cc
+++ b/src/monodroid/jni/embedded-assemblies.cc
@@ -19,9 +19,11 @@
 #endif
 
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/class.h>
 #include <mono/metadata/image.h>
 #include <mono/metadata/mono-config.h>
 #include <mono/metadata/mono-debug.h>
+#include <mono/metadata/reflection.h>
 
 #include "java-interop-util.h"
 
diff --git a/src/monodroid/jni/monodroid-glue.cc b/src/monodroid/jni/monodroid-glue.cc
index eea121906f1..bad6300f0d1 100644
--- a/src/monodroid/jni/monodroid-glue.cc
+++ b/src/monodroid/jni/monodroid-glue.cc
@@ -26,6 +26,7 @@
 #include <mono/jit/jit.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/class.h>
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mono-config.h>
 #include <mono/metadata/mono-debug.h>
@@ -2151,7 +2152,9 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl
 	jstring_wrapper &home = applicationDirs[SharedConstants::APP_DIRS_FILES_DIR_INDEX];
 
 #if defined (NET6)
-	mono_opt_aot_lazy_assembly_load = application_config.aot_lazy_load ? TRUE : FALSE;
+	// TODO: re-enable when we get on a newer .NET 7.
+	// We downgraded .NET 7 to workaround: https://github.com/dotnet/runtime/pull/68701
+	//mono_opt_aot_lazy_assembly_load = application_config.aot_lazy_load ? TRUE : FALSE;
 
 	{
 		MonoVMProperties monovm_props { home };
diff --git a/src/monodroid/jni/util.cc b/src/monodroid/jni/util.cc
index 25c0808a3d1..75a3fe435a9 100644
--- a/src/monodroid/jni/util.cc
+++ b/src/monodroid/jni/util.cc
@@ -21,6 +21,7 @@
 
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/class.h>
 
 #include "java-interop-util.h"
 
diff --git a/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs b/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs
index 3bc35032b0b..5f7c3e2c1b3 100644
--- a/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs
@@ -7,6 +7,9 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[Category ("UsesDevice"), Category ("AOT"), Category ("ProfiledAOT"), Category ("Node-3")]
+	// TODO: either we get .NET 7 support for https://github.com/dotnet/runtime/issues/56989
+	// Or update for .NET 7: https://github.com/jonathanpeppers/Mono.Profiler.Android
+	[Category ("DotNetIgnore")]
 	public class AotProfileTests : DeviceTest
 	{
 
diff --git a/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs b/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs
index 95c72088eb5..8242981e58e 100644
--- a/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs
@@ -11,7 +11,7 @@ namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
 	[TestFixtureSource(nameof(FixtureArgs))]
-	[Category ("Node-1")]
+	[Category ("Node-1"), Category ("XamarinBuildDownload")]
 	public class BundleToolTests : DeviceTest
 	{
 		static readonly object[] FixtureArgs = {
diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net6.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net7.0.txt
similarity index 100%
rename from tests/api-compatibility/acceptable-breakages-vReference-net6.0.txt
rename to tests/api-compatibility/acceptable-breakages-vReference-net7.0.txt