-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[automated] Merge branch 'release/10.0.3xx' => 'main' #52519
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 9.0.10-rtm.25475.8 to 9.0.10-rtm.25475.13 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.10-rtm.25475.8 to 9.0.10-rtm.25475.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [87db4525-6885-42da-8dd0-7ce296d7fd1a](https://maestro.dot.net/subscriptions?search=87db4525-6885-42da-8dd0-7ce296d7fd1a) - **Build**: [20250926.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2802641) ([284861](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-windowsdesktop/build/284861)) - **Date Produced**: September 26, 2025 2:21:06 PM UTC - **Commit**: [0a1da8fadb6a6f7b4cd30b9329cd43510bb75c9e](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC0a1da8fadb6a6f7b4cd30b9329cd43510bb75c9e) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.10][1] - Microsoft.WindowsDesktop.App.Ref - Microsoft.WindowsDesktop.App.Runtime.win-x64 - From [9.0.10-servicing.25475.9 to 9.0.10-servicing.25476.2][1] - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC9ff62aa845e3dc8c9f9d8679b847277cd7276c48&targetVersion=GC0a1da8fadb6a6f7b4cd30b9329cd43510bb75c9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
Fixes dotnet/source-build#5349 ---- #### AI description (iteration 1) #### PR Classification Bug fix addressing an XML parsing error caused by a problematic comment. #### PR Summary This pull request removes a commented out feed entry from the `/NuGet.config` file that was triggering an XML error. - `/NuGet.config`: Deleted the commented out feed line causing the XML issue. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-windowsdesktop build 20251003.8 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.10 -> To Version 9.0.10 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.10-servicing.25476.2 -> To Version 9.0.10-servicing.25503.8
…otnet-windowsdesktop build 20251007.10 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.10 -> To Version 9.0.11 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.10-servicing.25476.2 -> To Version 9.0.11-servicing.25507.10
…otnet-aspnetcore build 20251007.8 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.10-servicing.25475.17 -> To Version 9.0.11-servicing.25507.8 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.10 -> To Version 9.0.11
…otnet-aspnetcore build 20251008.7 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.10-servicing.25475.17 -> To Version 9.0.11-servicing.25508.7 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.10 -> To Version 9.0.11
…otnet-runtime build 20251009.7 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.10 -> To Version 9.0.11 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.10-servicing.25475.15 -> To Version 9.0.11-servicing.25509.7
…otnet-aspnetcore build 20251010.11 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.10-servicing.25475.17 -> To Version 9.0.11-servicing.25510.11 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.10 -> To Version 9.0.11
…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [57bb26e6-6f64-40cf-a4ea-5b973f41bc22](https://maestro.dot.net/subscriptions?search=57bb26e6-6f64-40cf-a4ea-5b973f41bc22) - **Build**: [20251009.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2812040) ([286423](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-runtime/build/286423)) - **Date Produced**: October 9, 2025 11:46:13 PM UTC - **Commit**: [f0a16c91c6de401c8b5e5f6ffb4175122bcfe70a](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCf0a16c91c6de401c8b5e5f6ffb4175122bcfe70a) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.11][1] - Microsoft.Bcl.AsyncInterfaces - Microsoft.Extensions.DependencyModel - Microsoft.Extensions.FileProviders.Abstractions - Microsoft.Extensions.FileSystemGlobbing - Microsoft.Extensions.Logging - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Logging.Console - Microsoft.NET.ILLink.Tasks - Microsoft.NETCore.App.Host.win-x64 - Microsoft.NETCore.App.Ref - Microsoft.NETCore.App.Runtime.win-x64 - Microsoft.Win32.SystemEvents - System.CodeDom - System.Composition.AttributedModel - System.Composition.Convention - System.Composition.Hosting - System.Composition.Runtime - System.Composition.TypedParts - System.Configuration.ConfigurationManager - System.Formats.Asn1 - System.Reflection.MetadataLoadContext - System.Resources.Extensions - System.Security.Cryptography.Pkcs - System.Security.Cryptography.ProtectedData - System.Security.Cryptography.Xml - System.Security.Permissions - System.ServiceProcess.ServiceController - System.Text.Encoding.CodePages - System.Text.Json - System.Windows.Extensions - From [9.0.10-servicing.25475.15 to 9.0.11-servicing.25509.7][1] - Microsoft.NET.HostModel - Microsoft.NETCore.Platforms - VS.Redist.Common.NetCore.SharedFramework.x64.9.0 - VS.Redist.Common.NetCore.TargetingPack.x64.9.0 - Microsoft.SourceBuild.Intermediate.runtime.linux-x64 [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1f19886fe3354963a4a790c896b3f99689fd7a5&targetVersion=GCf0a16c91c6de401c8b5e5f6ffb4175122bcfe70a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [87db4525-6885-42da-8dd0-7ce296d7fd1a](https://maestro.dot.net/subscriptions?search=87db4525-6885-42da-8dd0-7ce296d7fd1a) - **Build**: [20251007.10](https://dev.azure.com/dnceng/internal/_build/results?buildId=2810456) ([286065](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-windowsdesktop/build/286065)) - **Date Produced**: October 7, 2025 10:17:11 PM UTC - **Commit**: [ecbf2aa3a86b08609b70aac325aa4d5d6ab33f53](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GCecbf2aa3a86b08609b70aac325aa4d5d6ab33f53) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.11][2] - Microsoft.WindowsDesktop.App.Ref - Microsoft.WindowsDesktop.App.Runtime.win-x64 - From [9.0.10-servicing.25476.2 to 9.0.11-servicing.25507.10][2] - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0a1da8fadb6a6f7b4cd30b9329cd43510bb75c9e&targetVersion=GCecbf2aa3a86b08609b70aac325aa4d5d6ab33f53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df) - **Build**: [20251010.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2813063) ([286568](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-aspnetcore/build/286568)) - **Date Produced**: October 10, 2025 10:28:09 PM UTC - **Commit**: [4848e2c2eb6bed25769daeb61201c8edaa4b2578](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GC4848e2c2eb6bed25769daeb61201c8edaa4b2578) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10-servicing.25475.17 to 9.0.11-servicing.25510.11][3] - dotnet-dev-certs - dotnet-user-jwts - dotnet-user-secrets - Microsoft.AspNetCore.Analyzers - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.AspNetCore.Components.SdkAnalyzers - Microsoft.AspNetCore.DeveloperCertificates.XPlat - Microsoft.AspNetCore.Mvc.Analyzers - Microsoft.AspNetCore.Mvc.Api.Analyzers - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 - Microsoft.SourceBuild.Intermediate.aspnetcore - From [9.0.10 to 9.0.11][3] - Microsoft.AspNetCore.App.Ref - Microsoft.AspNetCore.App.Runtime.win-x64 - Microsoft.AspNetCore.Authorization - Microsoft.AspNetCore.Components.Web - Microsoft.AspNetCore.TestHost - Microsoft.Extensions.FileProviders.Embedded - Microsoft.Extensions.ObjectPool - Microsoft.JSInterop [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC5bae930797f60d2d04f3b1df6a33eaca85fc5f28&targetVersion=GC4848e2c2eb6bed25769daeb61201c8edaa4b2578&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
…otnet-windowsdesktop build 20251010.3 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.11 -> To Version 9.0.11 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.11-servicing.25507.10 -> To Version 9.0.11-servicing.25510.3 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.10-rtm.25475.13 -> To Version 9.0.11-rtm.25510.4 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.10-servicing.25475.6 -> To Version 9.0.11-servicing.25510.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.10-rtm.25475.13 -> To Version 9.0.11-rtm.25510.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…otnet-runtime build 20251010.10 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.11 -> To Version 9.0.11 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.11-servicing.25509.7 -> To Version 9.0.11-servicing.25510.10 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.10-servicing.25469.4 -> To Version 9.0.11-servicing.25509.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…otnet-runtime build 20251010.14 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.11 -> To Version 9.0.11 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.11-servicing.25509.7 -> To Version 9.0.11-servicing.25510.14
…otnet-runtime build 20251013.9 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.11 -> To Version 9.0.11 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.11-servicing.25509.7 -> To Version 9.0.11-servicing.25513.9
…otnet-aspnetcore build 20251014.2 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.11-servicing.25510.11 -> To Version 9.0.11-servicing.25514.2 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.11 -> To Version 9.0.11
…otnet-windowsdesktop build 20251014.3 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.11 -> To Version 9.0.11 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.11-servicing.25507.10 -> To Version 9.0.11-servicing.25514.3 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.10-rtm.25475.13 -> To Version 9.0.11-rtm.25514.5 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.10-servicing.25475.6 -> To Version 9.0.11-servicing.25514.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.10-rtm.25475.13 -> To Version 9.0.11-rtm.25514.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.10-servicing.25469.4 to 9.0.11-servicing.25509.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.10 to 9.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.10-servicing.25469.4 to 9.0.11-servicing.25509.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [57bb26e6-6f64-40cf-a4ea-5b973f41bc22](https://maestro.dot.net/subscriptions?search=57bb26e6-6f64-40cf-a4ea-5b973f41bc22) - **Build**: [20251013.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=2815040) ([286908](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-runtime/build/286908)) - **Date Produced**: October 14, 2025 3:39:33 AM UTC - **Commit**: [c0548208279209f56e32771afc90bb5d20dca41c](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCc0548208279209f56e32771afc90bb5d20dca41c) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.11 to 9.0.11][3] - Microsoft.Bcl.AsyncInterfaces - Microsoft.Extensions.DependencyModel - Microsoft.Extensions.FileProviders.Abstractions - Microsoft.Extensions.FileSystemGlobbing - Microsoft.Extensions.Logging - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Logging.Console - Microsoft.NET.ILLink.Tasks - Microsoft.NETCore.App.Host.win-x64 - Microsoft.NETCore.App.Ref - Microsoft.NETCore.App.Runtime.win-x64 - Microsoft.Win32.SystemEvents - System.CodeDom - System.Composition.AttributedModel - System.Composition.Convention - System.Composition.Hosting - System.Composition.Runtime - System.Composition.TypedParts - System.Configuration.ConfigurationManager - System.Formats.Asn1 - System.Reflection.MetadataLoadContext - System.Resources.Extensions - System.Security.Cryptography.Pkcs - System.Security.Cryptography.ProtectedData - System.Security.Cryptography.Xml - System.Security.Permissions ...
…dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 9.0.10-rtm.25475.13 to 9.0.11-rtm.25514.5 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.10-servicing.25475.6 to 9.0.11-servicing.25514.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.10-rtm.25475.13 to 9.0.11-rtm.25514.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: [87db4525-6885-42da-8dd0-7ce296d7fd1a](https://maestro.dot.net/subscriptions?search=87db4525-6885-42da-8dd0-7ce296d7fd1a) - **Build**: [20251014.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2815762) ([287055](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-windowsdesktop/build/287055)) - **Date Produced**: October 14, 2025 5:45:19 PM UTC - **Commit**: [06810481b9f770d01b5ad4e79887eac39a67882d](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC06810481b9f770d01b5ad4e79887eac39a67882d) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.11 to 9.0.11][2] - Microsoft.WindowsDesktop.App.Ref - Microsoft.WindowsDesktop.App.Runtime.win-x64 - From [9.0.11-servicing.25507.10 to 9.0.11-servicing.25514.3][2] - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCecbf2aa3a86b08609b70aac325aa4d5d6ab33f53&targetVersion=GC06810481b9f770d01b5ad4e79887eac39a67882d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
…otnet-aspnetcore build 20251014.11 On relative base path root dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.11-servicing.25510.11 -> To Version 9.0.11-servicing.25514.11 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.11 -> To Version 9.0.11
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df) - **Build**: [20251014.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2815789) ([287080](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-aspnetcore/build/287080)) - **Date Produced**: October 14, 2025 8:12:11 PM UTC - **Commit**: [89f72e8729b1680dcbd69cb4461fee2df1f98951](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GC89f72e8729b1680dcbd69cb4461fee2df1f98951) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.11-servicing.25510.11 to 9.0.11-servicing.25514.11][2] - dotnet-dev-certs - dotnet-user-jwts - dotnet-user-secrets - Microsoft.AspNetCore.Analyzers - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.AspNetCore.Components.SdkAnalyzers - Microsoft.AspNetCore.DeveloperCertificates.XPlat - Microsoft.AspNetCore.Mvc.Analyzers - Microsoft.AspNetCore.Mvc.Api.Analyzers - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 - Microsoft.SourceBuild.Intermediate.aspnetcore - From [9.0.11 to 9.0.11][2] - Microsoft.AspNetCore.App.Ref - Microsoft.AspNetCore.App.Runtime.win-x64 - Microsoft.AspNetCore.Authorization - Microsoft.AspNetCore.Components.Web - Microsoft.AspNetCore.TestHost - Microsoft.Extensions.FileProviders.Embedded - Microsoft.Extensions.ObjectPool - Microsoft.JSInterop [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC4848e2c2eb6bed25769daeb61201c8edaa4b2578&targetVersion=GC89f72e8729b1680dcbd69cb4461fee2df1f98951&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
…otnet-runtime build 20251014.14 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.11 -> To Version 9.0.11 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.11-servicing.25513.9 -> To Version 9.0.11-servicing.25514.14
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
| { | ||
| var count = 0; | ||
| if (pathOptions.TestModules is not null) | ||
| if (parseResult.HasOption(definition.TestModulesFilterOption)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like wrong conflict reaolution here. Please avoid merging until I review this.
|
@MiYanni could you please help me to take a look at this issue? |
|
@dotnet/dotnet-testing-admin Seems to be some test related failures.
|
|
First one is flaky as far as I can tell. Second one was a wrong merge conflict resolution. Let's see if now will be green. |
I detected changes in the release/10.0.3xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/10.0.3xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.3xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.