From 1c2176662790f8aea0fbd2ba806d0c77a81fc7b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jun 2026 02:18:51 +0000 Subject: [PATCH 1/2] Backflow from https://github.com/dotnet/dotnet / e92aef9 build 319774 Diff: https://github.com/dotnet/dotnet/compare/a065c06c0c5f5647d8e312fc70dec3f5ca77b830..e92aef9c9fd05991d32c4f2a1525710fef4aa9df From: https://github.com/dotnet/dotnet/commit/a065c06c0c5f5647d8e312fc70dec3f5ca77b830 To: https://github.com/dotnet/dotnet/commit/e92aef9c9fd05991d32c4f2a1525710fef4aa9df [[ commit created by automation ]] --- Directory.Build.props | 5 ----- Directory.Build.targets | 5 ----- Directory.Packages.props | 1 - 3 files changed, 11 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c2d9e2ee336..4255504f8d8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -72,9 +72,4 @@ XUnitV3 - - - true - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 9896e75ee47..4bdff2371c4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -13,11 +13,6 @@ <_Parameter1>windows6.1 - - - - - diff --git a/Directory.Packages.props b/Directory.Packages.props index 4e1d9e2536d..5bf587da830 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,7 +7,6 @@ - From 8180e05475cdb9ab262f0211ef8781b57f75d699 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jun 2026 02:18:51 +0000 Subject: [PATCH 2/2] Update dependencies from build 319774 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CMake.Sdk, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.XUnitV3Extensions (Version 11.0.0-beta.26317.104 -> 11.0.0-beta.26322.110) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, Microsoft.Win32.SystemEvents, runtime.win-x64.Microsoft.NETCore.ILAsm, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Nrbf, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Text.Encodings.Web, System.Text.Json, System.Windows.Extensions, runtime.win-x86.Microsoft.NETCore.ILAsm (Version 11.0.0-preview.6.26317.104 -> 11.0.0-preview.6.26322.110) Removed Dependencies: Microsoft.NETCore.Platforms (Version 11.0.0-preview.6.26317.104) [[ commit created by automation ]] --- eng/Version.Details.props | 52 +++++----- eng/Version.Details.xml | 106 ++++++++++----------- eng/common/native/NativeAotSupported.props | 26 +++++ global.json | 8 +- 4 files changed, 106 insertions(+), 86 deletions(-) create mode 100644 eng/common/native/NativeAotSupported.props diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c05fa13d95d..6c03e552197 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,32 +6,31 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-beta.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 + 11.0.0-preview.6.26322.110 @@ -47,7 +46,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreILAsmPackageVersion) $(MicrosoftNETCoreILDAsmPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(runtimewinx64MicrosoftNETCoreILAsmPackageVersion) $(runtimewinx86MicrosoftNETCoreILAsmPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfc24d825d2..cb184b88e6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,114 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 - - - https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + e92aef9c9fd05991d32c4f2a1525710fef4aa9df diff --git a/eng/common/native/NativeAotSupported.props b/eng/common/native/NativeAotSupported.props new file mode 100644 index 00000000000..559a6663929 --- /dev/null +++ b/eng/common/native/NativeAotSupported.props @@ -0,0 +1,26 @@ + + + + + <_NativeAotSupportedOS Condition=" + '$(TargetOS)' != 'browser' and + '$(TargetOS)' != 'haiku' and + '$(TargetOS)' != 'illumos' and + '$(TargetOS)' != 'netbsd' and + '$(TargetOS)' != 'solaris' + ">true + + + <_NativeAotSupportedArch Condition=" + '$(TargetArchitecture)' != 'wasm' and + ('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows') + ">true + + true + + + diff --git a/global.json b/global.json index 4ed09398520..fd2ab427100 100644 --- a/global.json +++ b/global.json @@ -24,11 +24,11 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26317.104", - "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26317.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26317.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26322.110", + "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26322.110", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26322.110", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26317.104" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26322.110" }, "native-tools": { "cmake": "latest"