From 085d325b15b44313764c50be8317348ebda27c04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Feb 2022 11:33:05 -0500 Subject: [PATCH] [release/6.0.2xx-preview13] Update dependencies from xamarin/xamarin-android (#4564) * Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.2xx-preview13-718860ebbb1cd8d3faf9237b31110f47eb68ff42-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.13.45 -> To Version 31.0.200-preview.13.47 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Extensions.Primitives,Microsoft.Extensions.Hosting,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration.Binder,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.Configuration.CommandLine,Microsoft.Extensions.Configuration.EnvironmentVariables,Microsoft.Extensions.Configuration.FileExtensions,Microsoft.Extensions.Configuration.Json,Microsoft.Extensions.Configuration.UserSecrets,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Composite,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.FileProviders.Physical,Microsoft.Extensions.FileSystemGlobbing,Microsoft.Extensions.Logging.Configuration,Microsoft.Extensions.Logging.EventLog,Microsoft.Extensions.Logging.EventSource,Microsoft.Extensions.Options,Microsoft.Extensions.Options.ConfigurationExtensions,System.CodeDom,System.Runtime.CompilerServices.Unsafe,System.Diagnostics.DiagnosticSource,System.Diagnostics.EventLog,System.IO.Pipelines,System.Text.Encodings.Web,System.Text.Json From Version 6.0.2-mauipre.1.22074.5 -> To Version 6.0.2-mauipre.1.22102.15 (parent: Microsoft.Android.Sdk.Windows * android now includes aot bits, android-aot is gone * Revert "android now includes aot bits, android-aot is gone" This reverts commit 2222be9e396259de53646c75ee32e80986672ff6. * Remove emsdk manifest * Don't use dotnet here as per #4574 * Revert "Don't use dotnet here as per #4574" This reverts commit 7e79785a79d3415fb086edb9300ee020309fd063. Co-authored-by: dotnet-maestro[bot] Co-authored-by: redth Co-authored-by: Jonathan Peppers --- eng/Version.Details.xml | 144 +++++++++++------------ eng/Versions.props | 72 ++++++------ src/DotNet/Dependencies/Workloads.csproj | 2 - 3 files changed, 108 insertions(+), 110 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2efe3a53418..0204b42c0a11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e950d071463b02978f13d5324aeadd0eb9a51cfc + 9049a306f63b8cde045db941a3367c1b8efd076a - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/xamarin/xamarin-android - a261876ede10e81cbaf0748bfa76cd56531a2147 + 718860ebbb1cd8d3faf9237b31110f47eb68ff42 https://github.com/xamarin/xamarin-macios @@ -39,113 +39,113 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4e7d976438b0fc17f435804e801d5d68d193ec33 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4e7d976438b0fc17f435804e801d5d68d193ec33 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -183,33 +183,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef15b555537a90da229ce6474658ae1a9916a932 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 - + https://github.com/dotnet/runtime - 63715256cc94963d608ef3d683d2529332c5140c + 3da69c23c1f8f502ec2eb1d44ff2fe7522210282 diff --git a/eng/Versions.props b/eng/Versions.props index d6f29e0aceae..de46f25ea917 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.200-rtm.22078.8 + 6.0.200-rtm.22106.1 - 6.0.2-mauipre.1.22074.5 + 6.0.2-mauipre.1.22102.15 - 31.0.200-preview.13.45 + 31.0.200-preview.13.47 15.2.301-preview.13.2 15.2.301-preview.13.2 @@ -25,42 +25,42 @@ 6.0.1 6.0.1 6.0.1 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 6.0.1 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 6.0.1 6.0.1 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 - 6.0.2-mauipre.1.22074.5 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 + 6.0.2-mauipre.1.22102.15 6.0.200-preview.13.935 4.5.0 diff --git a/src/DotNet/Dependencies/Workloads.csproj b/src/DotNet/Dependencies/Workloads.csproj index 54754291e3bb..82a6140d5b0a 100644 --- a/src/DotNet/Dependencies/Workloads.csproj +++ b/src/DotNet/Dependencies/Workloads.csproj @@ -4,8 +4,6 @@ - -