Bump to dotnet/installer@c7afae69 7.0.100-preview.4.22174.1 (#6598)

Context: dotnet/runtime#56989
Context: dotnet/runtime#68734
Context: dotnet/runtime#68914
Context: dotnet/runtime#68701

Changes: dotnet/installer@04e40fa...c7afae6

	% git diff --shortstat 04e40fa9...c7afae69
	 98 files changed, 1788 insertions(+), 1191 deletions(-)

Changes: dotnet/runtime@a21b9a2...c5d40c9

	% git diff --shortstat a21b9a2d...c5d40c9e
	 28347 files changed, 1609359 insertions(+), 1066473 deletions(-)

Changes: dotnet/linker@01c4f59...04c49c9

	% git diff --shortstat 01c4f590...04c49c9d
	 577 files changed, 28039 insertions(+), 10835 deletions(-)

Updates to build with the .NET 7 SDK and use the runtime specified by
the SDK.  We no longer use different SDK & runtime versions.

This produces a 7.0.100 Android workload.

After this is merged we should be able to enable Maestro to consume
future .NET 7 builds from dotnet/installer/main.

~~ Known Issues ~~

AOT+LLVM crashes on startup:

  * dotnet/runtime#68914

Xamarin.Build.Download hits a breaking change with `ZipEntry`:

  * dotnet/runtime#68734
  * xamarin/XamarinComponents#1368

illink outputs different MVIDs per architecture:

  * dotnet/linker#2203
  * dotnet/runtime#67660

Size of `libmonosgen-2.0.so` regressed:

  * dotnet/runtime#68330
  * dotnet/runtime#68354

Newer .NET 7 builds crash on startup:

  * dotnet/runtime#68701
  * This is worked around by *disabling* lazy loading of AOT'd
    assemblies 6dc426f.
  * TODO: re-enable once we get a fixed .NET 7 runtime.

TODO: We can't yet push to the `dotnet7` feed. Working on this.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Peter Collins <pecolli@microsoft.com>

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>

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

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" />

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:

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:

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:

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

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

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

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

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>

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

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>

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>

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>

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@"

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

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@"

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 ()
  {

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");

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 ();

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)
  {

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",
  } :