From 2204af4993648885d2b9265903313b369a0905f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 14:21:47 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/installer build 20240112.11 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23628.5 -> To Version 9.0.100-alpha.1.24062.11 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 9.0.0-alpha.1.23627.5 -> To Version 9.0.0-alpha.1.24061.26 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d2bdf71768..722b26e9143 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 29db8a1157d69ade22d933d666ea5ec21a42c8c8 + 5e2e0f97587ecd33d108d16208522e4c764bb7c6 - + https://github.com/dotnet/runtime - 8121f82d7d46118eef03a99eecbde64d8021cec7 + 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb - + https://github.com/dotnet/runtime - 8121f82d7d46118eef03a99eecbde64d8021cec7 + 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb - + https://github.com/dotnet/emsdk - 13ad0749b943e56246a8c40aea3e58648dfa0996 + 5cda86493ac07dce11dcb04323d2b57eecff00b7 - + https://github.com/dotnet/cecil - 02026e5c1b054958851d2711fefa1b37027cab23 + 81facb3f6009be2cdce70df30452bb75e9a8f993 diff --git a/eng/Versions.props b/eng/Versions.props index 07a068db321..c72e4866b03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-alpha.1.23628.5 - 9.0.0-alpha.1.23627.5 - 9.0.0-alpha.1.23627.5 + 9.0.100-alpha.1.24062.11 + 9.0.0-alpha.1.24061.26 + 9.0.0-alpha.1.24061.26 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.24053.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23617.1 + 0.11.4-alpha.24052.1 $(MicrosoftNETCoreAppRefPackageVersion) From 0a3d495790b64689ae0ab80a5ddc7aaf016b281f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 19 Jan 2024 14:16:43 -0600 Subject: [PATCH 2/4] Update BuildReleaseArm64SimpleDotNet.apkdesc --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index 3e1ed09b09d..7bd5cb51f7c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -8,34 +8,34 @@ "Size": 1028 }, "assemblies/Java.Interop.dll": { - "Size": 61588 + "Size": 61587 }, "assemblies/Mono.Android.dll": { - "Size": 90724 + "Size": 90798 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5147 + "Size": 5225 }, "assemblies/rc.bin": { "Size": 1512 }, "assemblies/System.Console.dll": { - "Size": 6547 + "Size": 6546 }, "assemblies/System.Linq.dll": { - "Size": 7163 + "Size": 8553 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 554659 + "Size": 553721 }, "assemblies/System.Runtime.dll": { - "Size": 2551 + "Size": 2550 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 4028 + "Size": 4026 }, "assemblies/UnnamedProject.dll": { - "Size": 2937 + "Size": 2936 }, "classes.dex": { "Size": 377856 @@ -47,7 +47,7 @@ "Size": 339864 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3184512 + "Size": 3186504 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 @@ -56,10 +56,10 @@ "Size": 94504 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 155568 + "Size": 155560 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 11648 + "Size": 11680 }, "META-INF/BNDLTOOL.RSA": { "Size": 1223 From ea0ed204dbae9a28f2e41f731ce477c13e6d7c87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jan 2024 14:17:05 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/installer build 20240120.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23628.5 -> To Version 9.0.100-alpha.1.24070.3 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 9.0.0-alpha.1.23627.5 -> To Version 9.0.0-alpha.1.24066.33 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 722b26e9143..1f0f6ddf6c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 5e2e0f97587ecd33d108d16208522e4c764bb7c6 + f91d4ca399ea4389d04b4700965d207f3a8d5c3b - + https://github.com/dotnet/runtime - 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb + dbb335c6ba14b38400b2d8c3a5876698021ec089 - + https://github.com/dotnet/runtime - 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb + dbb335c6ba14b38400b2d8c3a5876698021ec089 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index c72e4866b03..ac0415292b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 9.0.100-alpha.1.24062.11 - 9.0.0-alpha.1.24061.26 - 9.0.0-alpha.1.24061.26 + 9.0.100-alpha.1.24070.3 + 9.0.0-alpha.1.24066.33 + 9.0.0-alpha.1.24066.33 7.0.0-beta.22103.1 7.0.0-beta.22103.1 9.0.0-alpha.1.24053.1 From 82bcd42b24e0b34270a7f62e4f007dc64fcfd399 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 22 Jan 2024 11:22:44 -0600 Subject: [PATCH 4/4] Bump to MSBuild.StructuredLogger 2.2.169 --- tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 061478cdb82..94a4d58464f 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -39,7 +39,7 @@ - +