From a53573dcbb9c6084d56838ec9346527fd51176c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 May 2026 05:04:49 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/dotnet build 20260524.4 On relative base path root Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26268.112 -> To Version 11.0.0-beta.26274.104 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26268.112 -> To Version 0.11.5-preview.26274.104 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.5.26268.112 -> To Version 11.0.0-preview.5.26274.104 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.5.26268.112 -> To Version 11.0.100-preview.5.26274.104 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ced58aafc6..b810b965755 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f https://github.com/dotnet/dotnet @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f - + https://github.com/dotnet/dotnet - c5d1f734662eb718e7431a4e679a29e47c380f04 + 76e6fea5515beef8e3973ddd13323edcc265ac9f https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index e52d1f95529..79a1f72e541 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.5.26268.112 + 11.0.100-preview.5.26274.104 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.5.26268.112 - 11.0.0-preview.5.26268.112 + 11.0.0-preview.5.26274.104 + 11.0.0-preview.5.26274.104 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26268.112 + 11.0.0-beta.26274.104 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.5.26268.112 - 0.11.5-preview.26268.112 + 11.0.100-preview.5.26274.104 + 0.11.5-preview.26274.104 4.3.0-preview.26265.5 10.0.7 11.0.0-preview.1.26104.118 From ce2419606f37db801af05a759b623641c90cee55 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 May 2026 08:31:17 -0500 Subject: [PATCH 2/7] Update BuildReleaseArm64 CoreCLR apkdesc files from CI artifacts Updated from PR #11477 macOS test artifacts: - BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc (from macOS-10 Attempt 3) - BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc (from macOS-3 Attempt 3) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...ldReleaseArm64SimpleDotNet.CoreCLR.apkdesc | 31 +++----- ...ldReleaseArm64XFormsDotNet.CoreCLR.apkdesc | 77 ++++--------------- 2 files changed, 27 insertions(+), 81 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc index 15e3aae8ee9..639f63202fb 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc @@ -5,43 +5,34 @@ "Size": 3036 }, "classes.dex": { - "Size": 400044 + "Size": 405624 }, "lib/arm64-v8a/libassembly-store.so": { - "Size": 3098192 + "Size": 3123768 }, "lib/arm64-v8a/libclrjit.so": { - "Size": 3223752 + "Size": 2783168 }, "lib/arm64-v8a/libcoreclr.so": { - "Size": 5771784 + "Size": 4873392 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 1366648 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { - "Size": 72344 + "Size": 72032 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 1280336 + "Size": 1262816 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 100552 + "Size": 100904 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 162000 + "Size": 160632 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 20424 - }, - "META-INF/BNDLTOOL.RSA": { - "Size": 1223 - }, - "META-INF/BNDLTOOL.SF": { - "Size": 2091 - }, - "META-INF/MANIFEST.MF": { - "Size": 1964 + "Size": 20744 }, "res/drawable-hdpi-v4/icon.png": { "Size": 2178 @@ -68,5 +59,5 @@ "Size": 1904 } }, - "PackageSize": 7632514 -} + "PackageSize": 7214523 +} \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc index 3e9a925186f..de5c0139a54 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc @@ -5,10 +5,10 @@ "Size": 6652 }, "classes.dex": { - "Size": 9444112 + "Size": 9411640 }, "classes2.dex": { - "Size": 156448 + "Size": 157320 }, "kotlin/annotation/annotation.kotlin_builtins": { "Size": 928 @@ -32,31 +32,31 @@ "Size": 2396 }, "lib/arm64-v8a/libassembly-store.so": { - "Size": 14076232 + "Size": 14099080 }, "lib/arm64-v8a/libclrjit.so": { - "Size": 3223752 + "Size": 2783168 }, "lib/arm64-v8a/libcoreclr.so": { - "Size": 5771784 + "Size": 4873392 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 1366648 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { - "Size": 72344 + "Size": 72032 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 1280336 + "Size": 1262816 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 100552 + "Size": 100904 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 162000 + "Size": 160632 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 147264 + "Size": 147584 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -208,12 +208,6 @@ "META-INF/androidx.viewpager2_viewpager2.version": { "Size": 6 }, - "META-INF/BNDLTOOL.RSA": { - "Size": 1221 - }, - "META-INF/BNDLTOOL.SF": { - "Size": 90142 - }, "META-INF/com.android.tools/proguard/coroutines.pro": { "Size": 1345 }, @@ -238,9 +232,6 @@ "META-INF/kotlinx_coroutines_core.version": { "Size": 5 }, - "META-INF/MANIFEST.MF": { - "Size": 90015 - }, "META-INF/maven/com.google.guava/listenablefuture/pom.properties": { "Size": 96 }, @@ -478,9 +469,6 @@ "res/color-night-v8/material_timepicker_modebutton_tint.xml": { "Size": 340 }, - "res/color-v21/abc_btn_colored_borderless_text_material.xml": { - "Size": 464 - }, "res/color-v23/abc_btn_colored_borderless_text_material.xml": { "Size": 500 }, @@ -514,9 +502,6 @@ "res/color/abc_background_cache_hint_selector_material_light.xml": { "Size": 468 }, - "res/color/abc_btn_colored_text_material.xml": { - "Size": 604 - }, "res/color/abc_hint_foreground_material_dark.xml": { "Size": 564 }, @@ -544,24 +529,6 @@ "res/color/abc_secondary_text_material_light.xml": { "Size": 464 }, - "res/color/abc_tint_btn_checkable.xml": { - "Size": 728 - }, - "res/color/abc_tint_default.xml": { - "Size": 1224 - }, - "res/color/abc_tint_edittext.xml": { - "Size": 772 - }, - "res/color/abc_tint_seek_thumb.xml": { - "Size": 604 - }, - "res/color/abc_tint_spinner.xml": { - "Size": 772 - }, - "res/color/abc_tint_switch_track.xml": { - "Size": 768 - }, "res/color/checkbox_themeable_attribute_color.xml": { "Size": 464 }, @@ -1699,9 +1666,6 @@ "res/drawable/mtrl_ic_error.xml": { "Size": 644 }, - "res/drawable/mtrl_popupmenu_background_dark.xml": { - "Size": 740 - }, "res/drawable/mtrl_popupmenu_background.xml": { "Size": 740 }, @@ -1798,15 +1762,6 @@ "res/layout-v21/notification_template_icon_group.xml": { "Size": 988 }, - "res/layout-v22/abc_alert_dialog_button_bar_material.xml": { - "Size": 1584 - }, - "res/layout-v22/material_timepicker_dialog.xml": { - "Size": 3184 - }, - "res/layout-v22/mtrl_alert_dialog_actions.xml": { - "Size": 1764 - }, "res/layout-v26/abc_screen_toolbar.xml": { "Size": 1560 }, @@ -1844,7 +1799,7 @@ "Size": 1684 }, "res/layout/abc_alert_dialog_button_bar_material.xml": { - "Size": 1536 + "Size": 1584 }, "res/layout/abc_alert_dialog_material.xml": { "Size": 2648 @@ -2009,7 +1964,7 @@ "Size": 1208 }, "res/layout/material_timepicker_dialog.xml": { - "Size": 3132 + "Size": 3184 }, "res/layout/material_timepicker_textinput_display.xml": { "Size": 684 @@ -2018,7 +1973,7 @@ "Size": 1136 }, "res/layout/mtrl_alert_dialog_actions.xml": { - "Size": 1620 + "Size": 1764 }, "res/layout/mtrl_alert_dialog_title.xml": { "Size": 956 @@ -2276,8 +2231,8 @@ "Size": 268 }, "resources.arsc": { - "Size": 812848 + "Size": 794696 } }, - "PackageSize": 21263139 -} + "PackageSize": 20745805 +} \ No newline at end of file From cb81a7f76f150e7fe7482da0854e4e6a780c8560 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 May 2026 19:07:47 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/dotnet build 20260527.4 On relative base path root Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26268.112 -> To Version 11.0.0-beta.26277.104 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26268.112 -> To Version 0.11.5-preview.26277.104 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.5.26268.112 -> To Version 11.0.0-preview.6.26277.104 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.5.26268.112 -> To Version 11.0.100-preview.6.26277.104 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80a67a949e8..f9960541a37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a https://github.com/dotnet/dotnet @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a - + https://github.com/dotnet/dotnet - 76e6fea5515beef8e3973ddd13323edcc265ac9f + b520ee7cc01690f70d1431951f554c4e0666a69a https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 96d80b23ee0..19e54282e57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.5.26274.104 + 11.0.100-preview.6.26277.104 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.5.26274.104 - 11.0.0-preview.5.26274.104 + 11.0.0-preview.6.26277.104 + 11.0.0-preview.6.26277.104 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26274.104 + 11.0.0-beta.26277.104 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.5.26274.104 - 0.11.5-preview.26274.104 + 11.0.100-preview.6.26277.104 + 0.11.5-preview.26277.104 4.3.0-preview.26274.1 10.0.7 11.0.0-preview.1.26104.118 From 0f86512bb152815e171bc5f05c362831ccb19f40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jun 2026 05:07:42 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/dotnet build 20260531.2 On relative base path root Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26268.112 -> To Version 11.0.0-beta.26281.102 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26268.112 -> To Version 0.11.5-preview.26281.102 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.5.26268.112 -> To Version 11.0.0-preview.6.26281.102 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.5.26268.112 -> To Version 11.0.100-preview.6.26281.102 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9960541a37..1f596c59921 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 https://github.com/dotnet/dotnet @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 - + https://github.com/dotnet/dotnet - b520ee7cc01690f70d1431951f554c4e0666a69a + e6542746cf944ff2a1a595edf2af006ef3046784 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 19e54282e57..9866f7a5f38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.6.26277.104 + 11.0.100-preview.6.26281.102 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.6.26277.104 - 11.0.0-preview.6.26277.104 + 11.0.0-preview.6.26281.102 + 11.0.0-preview.6.26281.102 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26277.104 + 11.0.0-beta.26281.102 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.6.26277.104 - 0.11.5-preview.26277.104 + 11.0.100-preview.6.26281.102 + 0.11.5-preview.26281.102 4.3.0-preview.26274.1 10.0.7 11.0.0-preview.1.26104.118 From d35b28de9ec9793f649c9049b1f7b5566170faef Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 3 Jun 2026 09:29:09 -0500 Subject: [PATCH 5/7] darc update-dependencies --id 317065 Updating 'Microsoft.DotNet.Build.Tasks.Feed': '11.0.0-beta.26281.102' => '11.0.0-beta.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Updating 'Microsoft.DotNet.Cecil': '0.11.5-preview.26281.102' => '0.11.5-preview.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Updating 'Microsoft.NET.ILLink': '11.0.0-preview.6.26281.102' => '11.0.0-preview.6.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Updating 'Microsoft.NET.Sdk': '11.0.100-preview.6.26281.102' => '11.0.100-preview.6.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Updating 'Microsoft.NETCore.App.Ref': '11.0.0-preview.6.26281.102' => '11.0.0-preview.6.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Updating 'Microsoft.TemplateEngine.Authoring.Tasks': '11.0.100-preview.6.26281.102' => '11.0.100-preview.6.26302.118' (from build '20260602.18' of 'https://github.com/dotnet/dotnet') Checking for coherency updates...done. Applying updates... done. --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fe22e34078..58999d15cbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 https://github.com/dotnet/dotnet @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 - + https://github.com/dotnet/dotnet - e6542746cf944ff2a1a595edf2af006ef3046784 + 6f5c5dc027109e572313690b0fc81dacbb2baba5 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index b1e44e3a5ad..050d1d70389 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.6.26281.102 + 11.0.100-preview.6.26302.118 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.6.26281.102 - 11.0.0-preview.6.26281.102 + 11.0.0-preview.6.26302.118 + 11.0.0-preview.6.26302.118 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26281.102 + 11.0.0-beta.26302.118 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.6.26281.102 - 0.11.5-preview.26281.102 + 11.0.100-preview.6.26302.118 + 0.11.5-preview.26302.118 4.3.0-preview.26281.6 10.0.7 11.0.0-preview.1.26104.118 From 40bc3d7e45a5ebd1c3e0f85342f5ec1ee7a6b2ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jun 2026 21:27:11 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/dotnet build 20260602.18 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26302.103 -> To Version 11.0.0-beta.26302.118 --- eng/Version.Details.xml | 4 +-- eng/common/cross/arm/tizen/tizen.patch | 9 ++++++ eng/common/cross/arm64/tizen/tizen.patch | 9 ++++++ eng/common/cross/armel/tizen/tizen.patch | 9 ++++++ eng/common/cross/riscv64/tizen/tizen.patch | 9 ++++++ eng/common/cross/x64/tizen/tizen.patch | 9 ++++++ eng/common/cross/x86/tizen/tizen.patch | 9 ++++++ eng/common/dotnet-install.ps1 | 32 ++++++++++++++++++++++ global.json | 2 +- 9 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 eng/common/cross/arm/tizen/tizen.patch create mode 100644 eng/common/cross/arm64/tizen/tizen.patch create mode 100644 eng/common/cross/armel/tizen/tizen.patch create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch create mode 100644 eng/common/cross/x64/tizen/tizen.patch create mode 100644 eng/common/cross/x86/tizen/tizen.patch create mode 100644 eng/common/dotnet-install.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22c7c5d6b01..733d83a6f95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ - + https://github.com/dotnet/dotnet - e0aa94285c859b6ab5061903e91dafffeee8094c + 6f5c5dc027109e572313690b0fc81dacbb2baba5 https://github.com/dotnet/dotnet diff --git a/eng/common/cross/arm/tizen/tizen.patch b/eng/common/cross/arm/tizen/tizen.patch new file mode 100644 index 00000000000..fb12ade7250 --- /dev/null +++ b/eng/common/cross/arm/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) ) diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch new file mode 100644 index 00000000000..2cebc547382 --- /dev/null +++ b/eng/common/cross/arm64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleaarch64) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) ) diff --git a/eng/common/cross/armel/tizen/tizen.patch b/eng/common/cross/armel/tizen/tizen.patch new file mode 100644 index 00000000000..ca7c7c1ff75 --- /dev/null +++ b/eng/common/cross/armel/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) ) diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 00000000000..eb6d1c07470 --- /dev/null +++ b/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/eng/common/cross/x64/tizen/tizen.patch b/eng/common/cross/x64/tizen/tizen.patch new file mode 100644 index 00000000000..56fbc881095 --- /dev/null +++ b/eng/common/cross/x64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-x86-64) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) ) diff --git a/eng/common/cross/x86/tizen/tizen.patch b/eng/common/cross/x86/tizen/tizen.patch new file mode 100644 index 00000000000..f4fe8838ad6 --- /dev/null +++ b/eng/common/cross/x86/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-i386) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) ) diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 new file mode 100644 index 00000000000..50ae6273768 --- /dev/null +++ b/eng/common/dotnet-install.ps1 @@ -0,0 +1,32 @@ +[CmdletBinding(PositionalBinding=$false)] +Param( + [string] $verbosity = 'minimal', + [string] $architecture = '', + [string] $version = 'Latest', + [string] $runtime = 'dotnet', + [string] $RuntimeSourceFeed = '', + [string] $RuntimeSourceFeedKey = '' +) + +. $PSScriptRoot\tools.ps1 + +if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) { + $dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR +} else { + $dotnetRoot = Join-Path $RepoRoot '.dotnet' +} + +$installdir = $dotnetRoot +try { + if ($architecture -and $architecture.Trim() -eq 'x86') { + $installdir = Join-Path $installdir 'x86' + } + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + ExitWithExitCode 1 +} + +ExitWithExitCode 0 diff --git a/global.json b/global.json index eba52cefc86..704d4d77e69 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.134", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.103" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.118" } } From 9234adcdbd62ef6189e38ae5f4e851fc922d5b51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jun 2026 20:20:45 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/dotnet build 20260604.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26302.103 -> To Version 11.0.0-beta.26304.106 Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26268.112 -> To Version 11.0.0-beta.26304.106 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26268.112 -> To Version 0.11.5-preview.26304.106 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.5.26268.112 -> To Version 11.0.0-preview.6.26304.106 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.5.26268.112 -> To Version 11.0.100-preview.6.26304.106 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 12 ++++---- .../core-templates/job/helix-job-monitor.yml | 2 +- eng/common/core-templates/job/job.yml | 6 ++++ .../native/LocateNativeCompiler.targets | 27 ++++++++++++++++++ eng/common/templates/job/job.yml | 5 ---- global.json | 2 +- 7 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 eng/common/native/LocateNativeCompiler.targets diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 733d83a6f95..86cd61a3a63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 https://github.com/dotnet/dotnet @@ -36,17 +36,17 @@ - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 - + https://github.com/dotnet/dotnet - 6f5c5dc027109e572313690b0fc81dacbb2baba5 + aa8dd55c7f0c988c422d132717a1035bb7a375e0 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 042c0e32550..732fdaacfc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.6.26302.118 + 11.0.100-preview.6.26304.106 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.6.26302.118 - 11.0.0-preview.6.26302.118 + 11.0.0-preview.6.26304.106 + 11.0.0-preview.6.26304.106 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26302.118 + 11.0.0-beta.26304.106 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.6.26302.118 - 0.11.5-preview.26302.118 + 11.0.100-preview.6.26304.106 + 0.11.5-preview.26304.106 4.3.0-preview.26281.6 10.0.8 11.0.0-preview.1.26104.118 diff --git a/eng/common/core-templates/job/helix-job-monitor.yml b/eng/common/core-templates/job/helix-job-monitor.yml index 767450da2fc..a8162c51166 100644 --- a/eng/common/core-templates/job/helix-job-monitor.yml +++ b/eng/common/core-templates/job/helix-job-monitor.yml @@ -170,7 +170,7 @@ jobs: toolArgs=( --helix-base-uri '${{ parameters.helixBaseUri }}' --polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}' - --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 2))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. + --max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully. --stage-name '$(System.StageName)' ) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 66c7988f222..cb60f529784 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -75,6 +75,12 @@ jobs: variables: - name: AllowPtrToDetectTestRunRetryFiles value: true + # Component Governance detection and CodeQL are not run in the public project + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - name: skipComponentGovernanceDetection + value: true + - name: Codeql.SkipTaskAutoInjection + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/native/LocateNativeCompiler.targets b/eng/common/native/LocateNativeCompiler.targets new file mode 100644 index 00000000000..028b33d9444 --- /dev/null +++ b/eng/common/native/LocateNativeCompiler.targets @@ -0,0 +1,27 @@ + + + + + clang + $(ROOTFS_DIR) + + + + + + + + $(_CC_LDFLAGS.SubString(0, $(_CC_LDFLAGS.IndexOf(';')))) + <_LDFLAGS>$(_CC_LDFLAGS.SubString($([MSBuild]::Add($(_CC_LDFLAGS.IndexOf(';')), 1)))) + lld + + + diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 5e261f34db4..85501406a54 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -21,11 +21,6 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - # we don't run CG in public - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable - artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: diff --git a/global.json b/global.json index 704d4d77e69..d2ee16952ba 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.134", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26302.118" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26304.106" } }