Skip to content

Commit 8fa5d99

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Bump to dotnet/installer@42ace91ba7 .NET 9.0.100-alpha.1.23603.1 (#8366)
Changes: dotnet/installer@e1fd7d9...42ace91 % git diff --shortstat e1fd7d9649...42ace91ba7 182 files changed, 8428 insertions(+), 2413 deletions(-) Changes: dotnet/runtime@287c10d...a26802a % git diff --shortstat 287c10d253...a26802aa57 10852 files changed, 266698 insertions(+), 198289 deletions(-) Changes: dotnet/emsdk@1999c8c...74e4868 % git diff --shortstat 1999c8c8ab...74e4868be8 39 files changed, 616 insertions(+), 260 deletions(-) Changes: dotnet/cecil@a112f15...45dd3a7 * dotnet/cecil@45dd3a7: [main] Update dependencies from dotnet/source-build-reference-packages (dotnet/cecil#116) * dotnet/cecil@0b78015: Update dependencies from https://github.com/dotnet/arcade build 20231008.1 (dotnet/cecil#115) * dotnet/cecil@64a8874: [main] Update dependencies from dotnet/source-build-reference-packages (dotnet/cecil#114) * dotnet/cecil@13d6536: [main] Update dependencies from dotnet/source-build-reference-packages (dotnet/cecil#113) * dotnet/cecil@89be445: [main] Update dependencies from dotnet/source-build-reference-packages (dotnet/cecil#112) * dotnet/cecil@84f4527: Update dependencies from https://github.com/dotnet/arcade build 20230913.1 (dotnet/cecil#111) Changes: dotnet/android-tools@08a6990...21de3d7 * dotnet/android-tools@21de3d7: [build] update $(MSBuildPackageReferenceVersion) to 17.6.3 (dotnet/android-tools#221) Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rc.2.23468.1 to 9.0.100-alpha.1.23603.1 * Microsoft.NETCore.App.Ref: from 8.0.0-rc.2.23466.4 to 9.0.0-alpha.1.23577.7 * Microsoft.NET.Workload.Emscripten.Current.Manifest-*.Transport: from 8.0.0-rc.2.23463.1 to 9.0.0-alpha.1.23572.3 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.23461.1 to 0.11.4-alpha.23509.2 ~~ Changes to the build ~~ `$(DotNetTargetFrameworkVersion)` is `9.0`, making assemblies like `Mono.Android.dll` target .NET 9.0, as well as `$(TargetFramework)` in project templates, etc. `$(DotNetStableTargetFramework)` is `8.0`, making various bootstrap tooling, command-line tools, and unit tests target .NET 8.0. .NET 9 has a new `.binlog` format, requiring `MSBuild.StructuredLogger` 2.2.100. `System.CodeDom` now targets 8.0.0, as we moved to 17.8 MSBuild assemblies from `xamarin-android-tools`. Add the `dotnet9` and `dotnet9-transport` feeds. The `dotnet9-transport` feed is used for non-customer-facing packages like `Microsoft.NET.ILLink`. `build-linux.yaml` was initially failing to restore `net8.0` projects because of the order it installed a .NET SDK. It was only working for `net7.0` projects, because a .NET 7 SDK was preinstalled on the build machines. Update `TestSlicerToolVersion` and `dotnet-test-slicer` to `0.1.0-alpha7`, previously it was failing to discover tests in a `net8.0` project. Provision Mono workload manifests for: `net6`, `net7`, `net8`, and `current` (`net9`). Call `Utilities.DeleteDirectory()` on these directories to be sure we are in a clean state. dotnet/android-tools@21de3d7 is needed to fix various NU1605 warnings: error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.5.0 to 17.3.2. Reference the package directly from the project to select a different version. error NU1605: MSBuildDeviceIntegration -> MSBuild.StructuredLogger 2.2.100 -> doh (>= 17.5.0) error NU1605: MSBuildDeviceIntegration -> Microsoft.Build.Framework (>= 17.3.2) Update workload aliases to include `Microsoft.Android.Sdk.net9` and `Microsoft.Android.Sdk.net8`. Remove the .NET 7 Android workload from .NET 9. Import `Eol.targets` for .NET 6/7 projects. Update various parameterized tests to target `net8.0` and `net9.0` appropriately while dropping `net7.0` support. An initial update to the AOT profile for .NET 9. Updated `*.apkdesc` files: there were some minor `.apk` size changes. ~~ `$(AllowSelfContainedWithoutRuntimeIdentifier)` ~~ Context: dotnet/sdk@d21e6bf Context: d12da3a @rolfbjarne introduced an "escape hatch" in the .NET 9 SDK for emitting a build warning for a case that doesn't make sense on mobile. All mobile apps are self-contained, and we define RIDs by default, so the error is not needed. We can also stop setting `$(PublishSelfContained)` to `false`, as `$(AllowSelfContainedWithoutRuntimeIdentifier)` is sufficient in .NET 9. ~~ Changes to `<ILStrip/>` ~~ Context: dotnet/runtime#90436 * `$(IntermediateOutputPath)` is now required. * `[Output] TrimmedAssemblies` renamed to `UpdatedAssemblies`. * Output items shape changed, so now use `%(UntrimmedAssemblyFilePath)` and we can `<Copy/>` based on `%(ILStripped)`. The new code is better, so generally these changes seem *good*. ~~ Refactoring ~~ Rename `$(AndroidNet7Version)` to `$(AndroidNetPreviousVersion)` to make this property more generic for future releases. Use `@NET_PREVIOUS_VERSION@` as a replacement instead of `@NET7_VERSION@`. ~~ TODO ~~ * #8548 The `MicrosoftIntune` test is failing because they have a check for == `8.0` that needs to be updated to be >= `8.0`. This test is running on our `release/8.0.1xx` branch, but we can hopefully re-enable in main after their next release. * A specific case of `dotnet publish -f net8.0-android -r android-arm` is failing with: error NETSDK1185: The Runtime Pack for FrameworkReference 'Microsoft.Android.Runtime.34.android-arm' was not available. This may be because DisableTransitiveFrameworkReferenceDownloads was set to true. This is related to `$(AllowSelfContainedWithoutRuntimeIdentifier)`, but I will address in a future PR. This will likely require .NET 8 Android workload changes.
1 parent 4434a35 commit 8fa5d99

34 files changed

+208
-222
lines changed

‎Configuration.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
4343
<Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
4444
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
45-
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.95</AndroidNet7Version>
45+
<AndroidNetPreviousVersion Condition=" '$(AndroidNetPreviousVersion)' == '' ">34.0.56</AndroidNetPreviousVersion>
4646
</PropertyGroup>
4747
<PropertyGroup Condition=" '$(HostOS)' == '' ">
4848
<HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22

33
<PropertyGroup>
4-
<DotNetTargetFrameworkVersion>8.0</DotNetTargetFrameworkVersion>
4+
<DotNetTargetFrameworkVersion>9.0</DotNetTargetFrameworkVersion>
55
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
66
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
77
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
8-
<DotNetStableTargetFramework>net7.0</DotNetStableTargetFramework>
8+
<DotNetStableTargetFramework>net8.0</DotNetStableTargetFramework>
99
<TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- NuGet Package Versions -->
44
<ItemGroup>
55
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
6-
<PackageReference Update="System.CodeDom" Version="6.0.0" />
6+
<PackageReference Update="System.CodeDom" Version="8.0.0" />
77
<PackageReference Update="Irony" Version="1.1.0" />
88
</ItemGroup>
99

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUNTIME := $(shell which mono64 2> /dev/null && echo mono64 || echo mono)
77
SOLUTION = Xamarin.Android.sln
88
TEST_TARGETS = build-tools/scripts/RunTests.targets
99
API_LEVEL ?=
10-
PREPARE_NET_FX = net7.0
10+
PREPARE_NET_FX = net8.0
1111
PREPARE_ARGS =
1212
PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj
1313
PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS)

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
88
<!-- This is for packages needed by debugger-libs -->
99
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
10-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
1110
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1211
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
12+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
13+
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
1314
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
1415
<!-- Android binary, to support delta APK install -->
1516
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />

‎build-tools/automation/yaml-templates/build-linux.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ stages:
4444
# https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
4545
- checkout: maui
4646

47+
- template: setup-ubuntu.yaml
48+
4749
- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}:
4850
- checkout: monodroid
4951
clean: true
@@ -59,8 +61,6 @@ stages:
5961
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
6062
displayName: make prepare-external-git-dependencies
6163

62-
- template: setup-ubuntu.yaml
63-
6464
- task: NuGetAuthenticate@0
6565
displayName: authenticate with azure artifacts
6666
inputs:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ variables:
1616
- name: ApkDiffToolVersion
1717
value: 0.0.15
1818
- name: TestSlicerToolVersion
19-
value: 0.1.0-alpha5
19+
value: 0.1.0-alpha7
2020
- name: BootsToolVersion
2121
value: 1.1.0.36
2222
- name: NUnitConsoleVersion
2323
value: 3.16.3
2424
- name: NUnit.NumberOfTestWorkers
2525
value: 4
2626
- name: DotNetSdkVersion
27-
value: 7.0
27+
value: 8.0
2828
- name: DotNetSdkQuality
2929
value: GA
3030
- name: GitHub.Token
@@ -40,9 +40,9 @@ variables:
4040
- name: TeamName
4141
value: XamarinAndroid
4242
- name: DotNetTargetFramework
43-
value: net8.0
43+
value: net9.0
4444
- name: DotNetStableTargetFramework
45-
value: net7.0
45+
value: net8.0
4646
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
4747
- name: _WriteTelemetryProperties
4848
value: false

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ about the various Microsoft.Android workloads.
3535
<ReplaceFileContents
3636
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.json"
3737
DestinationFile="$(WorkloadManifestJsonPath)"
38-
Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET7_VERSION@=$(AndroidNet7Version)">
38+
Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
3939
</ReplaceFileContents>
4040
<ReplaceFileContents
4141
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.targets"
4242
DestinationFile="$(WorkloadManifestTargetsPath)"
43-
Replacements="@NET7_VERSION@=$(AndroidNet7Version)">
43+
Replacements="@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
4444
</ReplaceFileContents>
4545

4646
<ItemGroup>

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ protected override async Task<bool> Execute (Context context)
5454
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests");
5555

5656
// Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj
57-
var dotnets = new [] { "net6", "net7", "current" };
57+
var dotnets = new [] { "net6", "net7", "net8", "current" };
5858
foreach (var dotnet in dotnets) {
5959
var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain.{dotnet}");
60-
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) {
60+
Utilities.DeleteDirectory (destination, recurse: true);
61+
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "*")) {
6162
Utilities.CopyFileToDir (file, destination);
6263
}
6364
destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten.{dotnet}");
64-
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) {
65+
Utilities.DeleteDirectory (destination, recurse: true);
66+
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "*")) {
6567
Utilities.CopyFileToDir (file, destination);
6668
}
6769
}

‎build-tools/xaprepare/xaprepare/package-download.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
2323
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2424
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2525
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
26+
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2627
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Current.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
2728
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
2829
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
30+
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net8.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
2931
</ItemGroup>
3032

3133
</Project>

0 commit comments

Comments
 (0)