From 119d46c3a424ffeb3721718043616bfb10f5622f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 23 Aug 2024 11:16:54 -0500 Subject: [PATCH] Bump to 34.0.137 of the .NET 8 Android workload (#9243) Changes: https://github.com/dotnet/android/compare/34.0.113...b0fd011 .NET 8 changelog: * [Mono.Android] AndroidMessageHandler should follow HTTP-308 redirects (#8951) * [ci] Fix android source path for MAUI test job (#9030) * [ci] Update checkout path for nightly build (#9028) * [Mono.Android-Tests] Fix repo URL in redirect tests (#9035) * [Xamarin.Android.Build.Tasks] Support VS "Build Acceleration" (#9042) * [xaprepare] Always use release mono bundle (#9106) * [ci] Update sdk-insertions trigger to manual only (#9029) * Bump to dotnet/runtime/release/8.0@4a37e7305c 8.0.8 (#9033) * Bump to dotnet/installer/release/8.0.2xx@b638a84fba 8.0.205-servicing.24212.27 (#9032) * [ci] Disable CodeQL on macOS, Linux, non-main jobs (#9111) * [ci] Use DotNetCoreCLI to sign macOS files (#9102) * [tests] fix `InvalidTargetPlatformVersion` for `net8.0` (#9110) * [ci] Run "Push Internal" job on AzurePipelines-EO pool (#8991) * Bump to dotnet/runtime/release/8.0@2d5c0b720c 8.0.8 (#9123) * [Mono.Android] Data sharing and Close() overrides (#9103) * [Xamarin.Android.Build.Tasks] fix `Inputs` for `_Generate*Java*` targets (#9174) * Bump to xamarin/monodroid@e6a7cf474a (#9193) * [release/8.0.4xx] Backport maestro and artifact drop infra improvements (#9195) * Bump to dotnet/runtime/release/8.0@62f69f1e86 8.0.9 (#9191) * Bump to dotnet/runtime/release/8.0@ed13b35174 8.0.9 (#9221) * [build] Update package metadata (#9230) * [Xamarin.Android.Build.Tasks] Rethink default property values (#9155) (#9224) * [Xamarin.Android.Build.Tasks] Fix an issue with incremental builds (#9183) * [ci] Improve push_signed_nugets job condition (#9240) ~~ Other changes ~~ * Setup Maestro to track .NET8 builds After setting up the appropriate changes in `Version.Details.xml`, I ran: > darc update-dependencies --id 235947 Looking up build with BAR id 235947 Updating 'Microsoft.Android.Sdk.Windows': '1' => '34.0.137' (from build '8.0.4xx- b0fd0113c829edd9bd1bc7d742255a237ff19f69-1' of 'https://github.com/dotnet/android') Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Local dependencies updated based on build with BAR id 235947 (8.0.4xx-b0fd0113c829edd9bd1bc7d742255a237ff19f69-1 from https://github.com/dotnet/android@release/8.0.4xx) --- Configuration.props | 1 - NuGet.config | 5 +++++ build-tools/create-packs/Directory.Build.targets | 3 --- build-tools/scripts/DotNet.targets | 2 -- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 3 +++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Configuration.props b/Configuration.props index f20d819c98b..c94ddd5c5c8 100644 --- a/Configuration.props +++ b/Configuration.props @@ -43,7 +43,6 @@ portable True latest - 34.0.113 Windows diff --git a/NuGet.config b/NuGet.config index 6a49e32ba4a..d2e90a5edf8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index 92e78a046bb..d1913bae21a 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -120,9 +120,6 @@ <_NuGetSources Include="$(OutputPath.TrimEnd('\'))" /> - - <_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" /> <_InstallArguments Include="android-$(AndroidLatestUnstableApiLevel)" Condition=" '@(_PreviewPacks->Count())' != '0' " /> diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 2c477fe1b55..0abbf564bdb 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -106,8 +106,6 @@ <_NuGetSources Condition=" '$(MauiUseLocalPacks)' == 'true' " Include="$(MauiPackagePath.TrimEnd('\'))" /> - <_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" /> <_InstallArguments Include="--skip-manifest-update" /> <_InstallArguments Include="--skip-sign-check" /> <_InstallArguments Include="--verbosity diag" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efe66ed5187..27c5511756e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -20,6 +20,11 @@ https://github.com/dotnet/cecil b9d928a9d65ed39b9257846e1b8e853cea609c00 + + + https://github.com/dotnet/android + b0fd0113c829edd9bd1bc7d742255a237ff19f69 + diff --git a/eng/Versions.props b/eng/Versions.props index b565d14f597..8dfed966193 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,6 +12,9 @@ 7.0.100-rc.1.22410.7 0.11.5-alpha.24379.1 $(MicrosoftNETCoreAppRefPackageVersion) + + 34.0.137 + $(MicrosoftAndroidSdkWindowsPackageVersion)