-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[main] Source code updates from dotnet/dotnet #52242
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
[main] Source code updates from dotnet/dotnet #52242
Conversation
[[ commit created by automation ]]
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.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-rc.1.25515.110 -> 11.0.0-alpha.1.25617.108) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25515.110 -> 10.0.0-preview.25617.108) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.1.0-preview-25515-110 -> 18.3.0-preview-25617-108) 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-preview.1.1610 -> 7.3.0-preview.1.11808) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25515.110 -> 11.0.100-alpha.25617.108) 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.3.0-1.25515.110 -> 5.3.0-1.25617.108) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25515.110 -> 2.0.0-preview.1.25617.108) Microsoft.DiaSymReader (Version 2.2.0-beta.25515.110 -> 3.0.0-alpha.25617.108) 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 (Version 11.0.0-beta.25515.110 -> 11.0.0-beta.25617.108) MSTest (Version 4.1.0-preview.25551.1 -> 4.1.0-preview.25575.3) Microsoft.Testing.Platform (Version 2.1.0-preview.25551.1 -> 2.1.0-preview.25575.3) Microsoft.FSharp.Compiler (Version 14.0.0-alpha1.25515.110 -> 15.1.200-servicing.25617.108) 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 11.0.100-alpha.25515.110 -> 11.0.100-alpha.25617.108) Microsoft.Web.Xdt (Version 3.2.0-preview.25515.110 -> 3.3.0-preview.25617.108) System.CommandLine (Version 2.0.0-rc.1.25515.110 -> 3.0.0-alpha.1.25617.108) Added Dependencies: Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.Dotnet.Wpf.ProjectTemplates, Microsoft.DotNet.Web.ItemTemplates.11.0, Microsoft.DotNet.Web.ProjectTemplates.11.0 (Version 11.0.0-alpha.1.25617.108) Removed Dependencies: Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0 (Version 10.0.0-rc.1.25515.110)
|
Caution There are conflicts with the <Source Uri="https://github.com/dotnet/dotnet" Mapping="sdk" Sha="6ec92e489cc9368695fb6a39c2afb55e1a735dec" BarId="295059" />💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
working on this... |
|
@dotnet/dotnet-analyzers can you help with this error |
|
Ignore the "Do not automerge downgrades" job failure. That's a false positive. |
|
Important The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes. Please continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
@marcpopMSFT Matt and I just pushed this newer backflow into this branch which contains fixes for all the remaining issues that we found in the VMR. (fix in the template, fix in BundledVersions.props, etc.). This should be last backflow necessary to get this green. For everything else, workarounds should be possible. |
|
@dotnet/dotnet-analyzers need someone to investigate DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync I can repro locally but have no experience with these types of tests. |
|
@nkolev92 can you take a look at the following failures |
…s://github.com/dotnet/sdk into darc-main-4deb146e-0f24-4bb6-8e42-4ae49a9c496a
…d_BailOut_NoDiagnosticAsync
…s://github.com/dotnet/sdk into darc-main-4deb146e-0f24-4bb6-8e42-4ae49a9c496a
| }, | ||
| `restore`: { | ||
| `frameworks`: { | ||
| `{tfm}`: { |
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.
Won't this mean that folks who might have restored with an older version will have an assets file that's not accepted by the new SDK?
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.
We had a quick chat offline and I think there's context that I think would be helpful to a more general audience.
- The breaking change is in https://github.com/NuGet/NuGet.Client/blob/43ba6f074eeb222a928a4326cd488e6f7d28d5c4/src/NuGet.Core/NuGet.ProjectModel/LockFile/LockFile.cs#L41-L47.
Basically:
NuGet/NuGet.Client@af9df1d#diff-47fd571b272b6e7fc56cb69d458354a22ba65c590645876d09ce8765dcb5de8a
We went from:
var framework = PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.TargetAlias.Equals(frameworkAlias, StringComparison.OrdinalIgnoreCase))?.FrameworkName;
if (framework != null)
{
return GetTarget(framework, runtimeIdentifier);
}
return null;to
return Targets.FirstOrDefault(t =>
t.TargetAlias.Equals(frameworkAlias) &&
(string.IsNullOrEmpty(runtimeIdentifier) && string.IsNullOrEmpty(t.RuntimeIdentifier) ||
string.Equals(runtimeIdentifier, t.RuntimeIdentifier, StringComparison.OrdinalIgnoreCase)));
So before this method would use the project->frameworks->TargetAlias to get the framework and look-up based on that.
Now the reader of the lock file "hydrates" the TargetAlias on the LockFileTarget directly, so we don't have to look-up based on the effective target framework anymore.
That code is done based on project->restore->frameworks->TargetAlias.
Both of these target alias properties were added in NET 5.0, so in the wild, every assets file in the wild that has project->frameworks->TargetAlias also has project->restore->frameworks->TargetAlias.
It just happened that this test bed didn't create the dummy data completely.
test/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
Outdated
Show resolved
Hide resolved
Removed the '--vulnerable' option from the download command arguments.
Note
This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
New Dependencies
Removed Dependencies
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch