-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[main] Source code updates from dotnet/dotnet #52028
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?
[main] Source code updates from dotnet/dotnet #52028
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.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-rc.1.25515.110 -> 10.0.0-rc.3.25603.102) 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.25603.102) 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-25603-102) 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.0.0-preview.1.10402) 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.25603.102) 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.25603.102) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25515.110 -> 2.0.0-preview.1.25603.102) Microsoft.DiaSymReader (Version 2.2.0-beta.25515.110 -> 3.0.0-alpha.25603.102) 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.25603.102) MSTest (Version 4.1.0-preview.25523.1 -> 4.1.0-preview.25575.3) Microsoft.Testing.Platform (Version 2.1.0-preview.25523.1 -> 2.1.0-preview.25575.3) Microsoft.FSharp.Compiler (Version 14.0.0-alpha1.25515.110 -> 15.1.200-servicing.25603.102) 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.25603.102) Microsoft.Web.Xdt (Version 3.2.0-preview.25515.110 -> 3.3.0-preview.25603.102) System.CommandLine (Version 2.0.0-rc.1.25515.110 -> 3.0.0-alpha.1.25603.102) Added Dependencies: Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.Dotnet.Wpf.ProjectTemplates (Version 10.0.0-rc.3.25603.102)
|
Caution There are conflicts with the <Source Uri="https://github.com/dotnet/dotnet" Mapping="sdk" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
# Conflicts: # eng/Signing.props # eng/Version.Details.props # eng/Version.Details.xml # eng/Versions.props # eng/common/core-templates/job/publish-build-assets.yml # eng/common/core-templates/post-build/post-build.yml # eng/common/core-templates/steps/install-microbuild.yml # global.json
|
Note: I had to actually go through the conflicts and determine which to keep, based on if it looked like it was an upgrade or not. Many changes were not chosen from |
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.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, 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.3.25603.102 -> 10.0.0-rc.3.25603.106) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25603.102 -> 10.0.0-preview.25603.106) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.3.0-preview-25603-102 -> 18.3.0-preview-25603-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-preview.1.10402 -> 7.0.0-preview.1.10406) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, 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.25603.102 -> 11.0.100-alpha.25603.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.3.0-1.25603.102 -> 5.3.0-1.25603.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25603.102 -> 2.0.0-preview.1.25603.106) Microsoft.DiaSymReader (Version 3.0.0-alpha.25603.102 -> 3.0.0-alpha.25603.106) 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.25603.102 -> 11.0.0-beta.25603.106) Microsoft.FSharp.Compiler (Version 15.1.200-servicing.25603.102 -> 15.1.200-servicing.25603.106) Microsoft.Web.Xdt (Version 3.3.0-preview.25603.102 -> 3.3.0-preview.25603.106) System.CommandLine (Version 3.0.0-alpha.1.25603.102 -> 3.0.0-alpha.1.25603.106)
|
@MiYanni The following code in the Version.Details.props file was removed by dotnet/dotnet, which caused the error. Should we contact the dotnet team to fix it, or should we add it back ourselves? Error: |
|
@dotnet/product-construction We're noticing certain code flow dependencies being missing from certain branches in the generated
Something about these makes me think they were added in-between the transition to the new |
|
@MiYanni It might be some kind of revert problem. But, at the very least, for the hot reload properties, the issue is that there isn't a dependency in Version.Details.xml for it. I'm more surprised by the ocassional removal of the other properties. If you see those, I'd file a code flow issue in https://github.com/dotnet/arcade-services. |
|
Caution There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/5a69737e6f6447fe397d552503a3909ea49f6f34
Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/5a69737e6f6447fe397d552503a3909ea49f6f34
Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/ce3dea8b1d1c12cf4b85999f834052d942d84a6d
Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
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.
Most of the changes in this file are due to NuGet dependencies flowing via the VMR (so from dotnet/dotnet) which is correct and therefore the entries getting moved up into the "dotnet/dotnet dependencies" section.
5a135a4 updated nuget dependencies two months ago but marked them as coming from nuget-client, which is wrong. NuGet-Client dependencies should always be consumed from VMR builds here in sdk. That's why we now see this large reshuffle cc @marcpopMSFT
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.
Thank you for the context and for pinging. I believe this backlog of NuGet changes from November (7.0.0-preview.1.1610 to 7.0.0-preview.1.10406) have caused some issues that are now surfacing, since the VMR isn't testing the logic.
One is that prune package data is failing:
Loading prune package data from PrunePackageData folder Failed to load prune package data from PrunePackageData folder, loading from targeting packs instead
from TrimmingOptions_Are_Defaulted_Correctly_On_Aot_Apps for example. This seems to be impacting many tests.
The targeting packs data doesn't seem to work either.
The other is that the Pack target is now missing in some of the NuGet tests:
`C:\h\w\AB94099E\t\dotnetSdkTests\2nkcwtjr.jby\Nuget_referen---A6B792D3\D_net461\D_net461.csproj : error MSB4057: The target "Pack" does not exist in the project.
@dotnet/nuget-team May you PTAL at these?
I think @nkolev92 is a good resource for prune package issues. @dsplaisted, are you familiar with the prune package issue - and do you think this would help #51978?
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.
I don't think 51978 will help - so this will require some investigation from nuget.
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.
I'm not sure about the prune issue. That's more of an internal thing for the SDK.
Regarding the pack stuff, @zivkan can probably help.
This is unfortunately probably related to dotnet/dotnet#3463 being really far out
| <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion> | ||
| <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion> | ||
| <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> | ||
| <MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion>5.3.0-1.25567.101</MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion> |
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.
This property gets removed because it doesn't have a corresponding Version.Details.xml entry. If it should live flow - same as the other dependencies - we should add an entry to Version.Details.xml. If not, then it should get moved out of this file into either Versions.props or Directory.Packages.props.
@javiercn (?) |
|
Thanks for your PR, @@dotnet-maestro[bot]. |
|
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
Updated Dependencies
Associated changes in source repos