Bump to .NET 8

Changes: dotnet/installer@11f6b8f...d552037
Changes: dotnet/linker@5f9bfd9...493ce62
Changes: dotnet/runtime@6d10e4c...b8d4980

A summary of what it took to get this working:

* Run `darc update-dependencies --id 152596`

* Setup .NET 6,7,8 "multi-targeting"

* Setup dotnet6/dotnet7/dotnet8 NuGet feeds

* `$(DotNetTargetFrameworkVersion)` should be 8.0

* Rename API diff for `net8.0`

* Fix `AutoImport.props` for 8.0

* Update `.apkdesc` files

* Update `CheckIncludedAssemblies` test

* Use .NET Core `3.1.x`

Trying to avoid:

    dotnet-install: Failed to locate the latest version in the channel '3.1.417' with 'preview' quality for 'dotnet-sdk', os: 'win', architecture: 'x64'.

* Install .NET 6 for legacy MSBuild tests

* [Mono.Android.Export] fix `NotSupportedException`

Context: https://github.com/mono/mono/blob/242ac50598e4f596e1a42f9dd377701096ea3a74/mcs/class/referencesource/mscorlib/system/reflection/emit/dynamicmethod.cs#L276-L277
Context: dotnet/runtime@e465230

    System.NotSupportedException: Wrong MethodAttributes or CallingConventions for DynamicMethod. Only public, static, standard supported

* Use correct Mono pack names for `$(AotAssemblies)`

* Fix `DotNetPublish` test

Was failing with:

    Build should be using C:\a_work\1\s\xamarin-android\bin\Release\dotnet\packs\Microsoft.Android.Ref.33\34.0.0-ci.pr.gh7451.52\ref\net7.0\Mono.Android.dll
Expected: True
But was:  False

* Remove a `net7.0` assertion for build warnings

See: dotnet/runtime#77385

* Pass `-SkipNonVersionedFiles` to `dotnet-install` scripts to avoid:

   dotnet --info
   Exited with code: 137

Author: jonathanpeppers

Configuration.props

@@ -47,6 +47,7 @@
     <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
+    <AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.1</AndroidNet7Version>
     <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.476</AndroidNet6Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">

Directory.Build.props

@@ -1,11 +1,11 @@
 <Project>
 
   <PropertyGroup>
-    <DotNetTargetFrameworkVersion>7.0</DotNetTargetFrameworkVersion>
+    <DotNetTargetFrameworkVersion>8.0</DotNetTargetFrameworkVersion>
     <DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
     <DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
     <!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
-    <DotNetStableTargetFramework>net6.0</DotNetStableTargetFramework>
+    <DotNetStableTargetFramework>net7.0</DotNetStableTargetFramework>
     <TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>

Makefile

@@ -7,7 +7,7 @@ RUNTIME       := $(shell which mono64 2> /dev/null && echo mono64 || echo mono)
 SOLUTION       = Xamarin.Android.sln
 TEST_TARGETS   = build-tools/scripts/RunTests.targets
 API_LEVEL     ?=
-PREPARE_NET_FX = net6.0
+PREPARE_NET_FX = net7.0
 PREPARE_ARGS =
 PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj
 PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS)

NuGet.config

@@ -5,13 +5,13 @@
     <!-- 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="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/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 6.0.9 -->
-    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-8c6bcad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8c6bcad1/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 6.0.11 -->
+    <add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

build-tools/automation/azure-pipelines.yaml

@@ -179,7 +179,8 @@ stages:
     # xabuild still depends on .NET Core 3 or earlier
     - template: yaml-templates\use-dot-net.yaml
       parameters:
-        version: 3.1.417
+        version: 3.1
+        quality: GA
 
     # Downgrade the XA .vsix installed into the instance of VS that we are building with so that we don't restore/build against a test version.
     # The VS installer will attempt to resume any failed or partial installation before trying to downgrade Xamarin.Android.

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -36,10 +36,16 @@ steps:
   displayName: set JI_JAVA_HOME
   condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
 
+# Install .NET 6 for legacy tests
 - template: use-dot-net.yaml
   parameters:
+    version: 6.0
+    quality: GA
     remove_dotnet: ${{ parameters.remove_dotnet }}
 
+# Install latest .NET
+- template: use-dot-net.yaml
+
 - task: DotNetCoreCLI@2
   displayName: shut down existing build daemons
   inputs:

build-tools/automation/yaml-templates/use-dot-net.yaml

@@ -3,6 +3,7 @@
 
 parameters:
   version: $(DotNetSdkVersion)
+  quality: $(DotNetSdkQuality)
   remove_dotnet: false
 
 steps:
@@ -37,7 +38,7 @@ steps:
               $sleepTime = $sleepTime * 2
           }
       }
-      & .\dotnet-install.ps1 -Version ${{ parameters.version }} -InstallDir $DotNetRoot -Verbose
+      & .\dotnet-install.ps1 -Channel ${{ parameters.version }} -Quality ${{ parameters.quality }} -InstallDir $DotNetRoot -SkipNonVersionedFiles -Verbose
     displayName: install .NET Core ${{ parameters.version }}
     condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
@@ -46,7 +47,7 @@ steps:
       (if [[ "${{ parameters.remove_dotnet }}" == "true" ]] ; then rm -rfv $DOTNET_ROOT; fi) &&
       curl -L https://dot.net/v1/dotnet-install.sh --retry 5 --retry-max-time 300 > dotnet-install.sh &&
       chmod +x dotnet-install.sh &&
-      ./dotnet-install.sh --version ${{ parameters.version }} --install-dir $DOTNET_ROOT --verbose &&
+      ./dotnet-install.sh --channel ${{ parameters.version }} --quality ${{ parameters.quality }} --install-dir $DOTNET_ROOT --skip-non-versioned-files --verbose &&
       PATH="$DOTNET_ROOT:$PATH" &&
       echo "##vso[task.setvariable variable=DOTNET_ROOT]$DOTNET_ROOT" &&
       echo "##vso[task.setvariable variable=PATH]$PATH"

build-tools/automation/yaml-templates/variables.yaml

@@ -18,7 +18,9 @@ variables:
 - name: NUnit.NumberOfTestWorkers
   value: 4
 - name: DotNetSdkVersion
-  value: 6.0.300
+  value: 7.0.1xx
+- name: DotNetSdkQuality
+  value: preview
 - name: GitHub.Token
   value: $(github--pat--vs-mobiletools-engineering-service2)
 - name: HostedMacImage
@@ -32,9 +34,9 @@ variables:
 - name: TeamName
   value: XamarinAndroid
 - name: DotNetTargetFramework
-  value: net7.0
+  value: net8.0
 - name: DotNetStableTargetFramework
-  value: net6.0
+  value: net7.0
 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
 - name: _WriteTelemetryProperties
   value: false

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

@@ -122,7 +122,8 @@
     </PropertyGroup>
     <ItemGroup>
       <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" />
-      <!-- This allows us to install our Android .NET 6 packs -->
+      <!-- This allows us to install our older Android .NET packs -->
+      <_NuGetSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
       <_NuGetSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
       <_PreviewPacks Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' " Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.Android.Ref.$(AndroidLatestUnstableApiLevel).*.nupkg" />
       <_InstallArguments Include="android" />

build-tools/create-packs/Microsoft.NET.Sdk.Android.proj

@@ -35,12 +35,12 @@ about the various Microsoft.Android workloads.
     <ReplaceFileContents
         SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.json"
         DestinationFile="$(WorkloadManifestJsonPath)"
-        Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET6_VERSION@=$(AndroidNet6Version)">
+        Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET7_VERSION@=$(AndroidNet7Version);@NET6_VERSION@=$(AndroidNet6Version)">
     </ReplaceFileContents>
     <ReplaceFileContents
         SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.targets"
         DestinationFile="$(WorkloadManifestTargetsPath)"
-        Replacements="@NET6_VERSION@=$(AndroidNet6Version)">
+        Replacements="@NET7_VERSION@=$(AndroidNet7Version);@NET6_VERSION@=$(AndroidNet6Version)">
     </ReplaceFileContents>
 
     <ItemGroup>