-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' #51187
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
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' #51187
Conversation
… Build ID 2800483
… Build ID 2800966
…250924.1 On relative base path root Microsoft.Testing.Platform From Version 1.9.0-preview.25470.1 -> To Version 1.9.0-preview.25474.1 MSTest From Version 3.11.0-preview.25470.1 -> To Version 3.11.0-preview.25474.1
… Build ID 2801306 (#50974)
… Build ID 2802097
…250925.1 On relative base path root Microsoft.Testing.Platform From Version 1.9.0-preview.25474.1 -> To Version 1.9.0-preview.25475.1 MSTest From Version 3.11.0-preview.25474.1 -> To Version 3.11.0-preview.25475.1
… Build ID 2802347
… Build ID 2802347
… Build ID 2802347 (#51014)
Co-authored-by: Matt Mitchell (.NET) <mmitche@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
[[ commit created by automation ]]
…801b-af106d081ec2 Auto-resolved conflicts: - src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs
Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, 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 (Version 10.0.0-rtm.25507.103 -> 10.0.0-rtm.25509.106) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25507.103 -> 10.0.0-preview.25509.106) Microsoft.Build, Microsoft.Build.Localization (Version 18.0.0-preview-25507-103 -> 18.0.0-preview-25509-106) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-rc.803 -> 7.0.0-rc.1006) Microsoft.Build.Tasks.Git, Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25507.103 -> 10.0.0-beta.25509.106) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25507.103 -> 5.0.0-2.25509.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25507.103 -> 2.0.0-preview.1.25509.106) Microsoft.DiaSymReader (Version 2.2.0-beta.25507.103 -> 2.2.0-beta.25509.106) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25507.103 -> 14.0.100-rc2.25509.106) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-release-25507-103 -> 18.0.0-release-25509-106) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rtm.25507.103 -> 10.0.100-rtm.25509.106) Microsoft.Web.Xdt (Version 3.2.0-preview.25507.103 -> 3.2.0-preview.25509.106) System.CommandLine (Version 2.0.0-rtm.25507.103 -> 2.0.0-rtm.25509.106)
… merge/release/10.0.1xx-to-release/10.0.2xx
@nagilson could you please take a look at these failure test cases? |
This is all #51147 |
I'm not sure why BA is not flagging all of them as known. It's 20 tests w/ the same issue. The string match pattern appears to be present in all of them. It worked for another PR (same case of tests and same failure cause) but not this one. I'll try to rerun the BA check. |
Ah, it manifests differently in the output as |
So, I can't mark that as a known issue because the proper output is in stdout and it's not on helix so its not captured in the text to scan. The best I could do is flag If not, then I'll just propose we merge this on red. |
@SimonZhao888 May you please help to mark all of these template engine tests as skipped and track that? I apologize that the known issue tracking isn't really sufficient in this case. For reference: |
OK, got it! |
I detected changes in the release/10.0.1xx branch which have not been merged yet to release/10.0.2xx. I'm a robot and am configured to help you automatically keep release/10.0.2xx up to date, so I've opened this PR.
This PR merges commits made on release/10.0.1xx 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.1xx-to-release/10.0.2xx'. 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.