[release/10.0.1xx] Source code updates from dotnet/dotnet #51633
Conversation
[[ commit created by automation ]]
…b38b-cfa19e71f296
Updated Dependencies: 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, Microsoft.NET.HostModel, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.Platforms, Microsoft.WindowsDesktop.App.Internal (Version 10.0.0-rtm.25520.117 -> 10.0.1-servicing.25555.106) Microsoft.AspNetCore.App.Ref, 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.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.Metadata, 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.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NETCore.App.Ref, Microsoft.Win32.SystemEvents, 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 -> 10.0.1) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25520.117 -> 10.0.0-preview.25555.106) Microsoft.Build (Version 18.0.0 -> 18.0.3) Microsoft.Build.Localization (Version 18.0.0-servicing-25520-117 -> 18.0.3-servicing-25555-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.2117 -> 7.0.0-rc.5606) 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.25520.117 -> 10.0.0-beta.25555.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.25520.117 -> 5.0.0-2.25555.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25520.117 -> 2.0.0-preview.1.25555.106) Microsoft.DiaSymReader (Version 2.2.0-beta.25520.117 -> 2.2.0-beta.25555.106) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25520.117 -> 14.0.101-servicing.25555.106) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.1-release-25520-117 -> 18.0.1-release-25555-106) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common (Version 10.0.100 -> 10.0.101) Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rtm.25520.117 -> 10.0.101-servicing.25555.106) Microsoft.Web.Xdt (Version 3.2.0-preview.25520.117 -> 3.2.0-preview.25555.106) System.CommandLine (Version 2.0.0 -> 2.0.1)
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
|
@nagilson Could you please help me to take a look at this issue? |
…d87-4769-b38b-cfa19e71f296
| <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel> | ||
| <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel> | ||
| <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel> | ||
| <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'"></PreReleaseVersionIteration> |
There was a problem hiding this comment.
@mmitche You made this simplification in the VMR, right? I assume you were just blindly doing this for all the repos. Assuming you'll be doing this in the future, I can live with this but the logic in here existed because I kept forgetting to do the rtm to servicing transition when it came to the sdk feature bands. Should I consider bringing that back?
There was a problem hiding this comment.
Yeah, made in the VMR. The other repos don't have this logic. I removed it because it's no longer active at all. We never set StabilizePackageVersion==true. The value is passed in at the top level (via DotNetFinalVersionKind). I didn't want the default build to show servicing, but if you queue a non-stable one, it would show RTM.
…d87-4769-b38b-cfa19e71f296
|
@jjonescz There are three failing run file tests. Could you take a look at them? |
|
There seems to be some mismatch in the redist sdk here. My test just catches that mismatch.
That's how the test fails (it expects both of those to match), but I can see many occurrences of both 10.0.0 and 10.0.1 versions in the binlog of building a simple console app with the redist sdk from this branch. That seems suspicious to me. If it is expected that these versions are mismatched, I'd like to know how can I obtain the "10.0.0" version from inside the sdk CLI (if not via If it is not expected, please consider adding a test specifically for this, so it's not just my run-file tests that catch this. |
…d87-4769-b38b-cfa19e71f296
|
@jjonescz This is expected. When you build a framework-dependent app, it does not depend on the latest patch of the runtime. That's what's expressed in the runtimeconfig file. The reason for this is that we don't want you to update the .NET SDK, build and deploy an app, and have that app fail to run because the target environment hasn't installed the latest patch yet. At runtime, it does roll forward to the latest installed patch of the .NET runtime. That's_ what you're getting from the FrameworkDescription. See https://learn.microsoft.com/en-us/dotnet/core/versions/selection#framework-dependent-apps-roll-forward. What is the test trying to validate by comparing those versions? |
The test is validating that a manual csc execution (which is used during an optimized compilation of a file-based app) generates the same runtimeconfig.json as MSBuild would. The manual csc execution (CSharpCompilerCommand) uses Do you know if there is another property available in the dotnet.dll that the CSharpCompilerCommand could use to emit the same version as MSBuild would? |
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
Updated Dependencies
Associated changes in source repos