-
Notifications
You must be signed in to change notification settings - Fork 5.2k
[release/10.0] Source code updates from dotnet/dotnet #121366
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: release/10.0
Are you sure you want to change the base?
[release/10.0] Source code updates from dotnet/dotnet #121366
Conversation
[[ commit created by automation ]]
Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25515.111 -> 5.0.0-2.25554.104) Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100 -> 10.0.101) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25515.111 -> 10.0.0-beta.25554.104) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25515.111 -> 0.11.5-alpha.25554.104) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25515.111 -> 2.9.3-beta.25554.104) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0 -> 10.0.1) Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rtm.25515.111 -> 10.0.101-servicing.25554.104) NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.0.0-rc.1611 -> 7.0.0-rc.5504) System.CommandLine (Version 2.0.0 -> 2.0.1) Microsoft.DotNet.XHarness.TestRunners.Common, Microsoft.DotNet.XHarness.TestRunners.Xunit, Microsoft.DotNet.XHarness.CLI (Version 10.0.0-prerelease.25527.1 -> 10.0.0-prerelease.25506.2)
|
@dotnet/runtime-infrastructure linker tests are failing with |
|
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/product-construction for assistance. |
…-a4a6-a82885e38181
|
@ericstj ^ |
|
@akoeplinger This hack should be removed, like you did in main. 2abf811
|
|
Looks like this test is failing due to wrong I grabbed a binlog and noticed --> This is happening because of this --> runtime/Directory.Build.targets Line 62 in b2842ae
And this PR changed the PreReleaseVersionLabel to servicing. What's our expectation here? It looks like 9.0 servicing set both Lines 17 to 18 in 9c2fb4b
While this is not set in 10.0 Lines 18 to 19 in c1ad1c6
So maybe that's what we should do here, that would fix these tests, since they use this to control the behavior. @mmitche @akoeplinger ? |
|
@ericstj @mmitche @akoeplinger ping on ^ |
|
@ericstj The stabilization setting isn't controlled at the repo level in UB. It's essentially a pipeline parameter. Is it possible to avoid assumptions based on the servicing label? The reason I ask is that we may still produce non-stable servicing builds, possibly for hotfixes. |
…-a4a6-a82885e38181
|
So right now, the product has the correct value (stable), it's just the tests that are wrong (assuming not stable). I'm guessing we want to preserve this, even for pre-release hotfixes - but that's up for debate. Tests have behavior that differs by the value of Line 8 in 04c4fe6
While the product's behavior differs off of runtime/Directory.Build.targets Lines 61 to 63 in b2842ae
I shared those other properties to show how this was working before. Maybe we just make the tests honor |
|
Regarding pruning:
Note that even if those components build with the live targeting pack, work needs to be done in runtime to give the SDK the live PackageOverrides.txt for pruning. Filed #121611 |
|
@premun @dotnet/prodconsvcs There hasn't been flow from runtime 10.0 to VMR in like 2 weeks...could this PR be the reason? |
|
More test failures around the new versioning -- It's like we didn't do readiness with PR validation? |
There was PR validation on the internal flow |
Maybe we didn't test non-stable PR validation, or we did something different during readiness then we're doing now. Regardless, we have another set of host tests to fix here. I can give it a crack. cc @agocke Looks like the value of this comes from here
Tests are getting
Which is the package version. So similar to before -- |
…-a4a6-a82885e38181
|
A few more host tests failing, which I'll help fix. @akoeplinger have you looked at the other failures? |
|
@akoeplinger looks like JIT tests are something you looked at in main -- #121164 (comment). I ported your fix. |
|
So there are some networking failures, and some more version inconsistency failures (assuming prerelease vs not prerelease in servicing). This time in
I think in this case we should make the ClrProductVersion sent on the pipe to not have the suffix - or make the test use something other than InformationalVersion to compare to. RuntimeProductVersion is defined as $(Version) runtime/eng/versioning.targets Line 167 in 6eb2b9b
So this is more fallout from setting PreReleaseVersionLabel to servicing without setting StabalizePackageVersion. I've been plowing ahead assuming product behavior was correct (packages with version suffix, but informational version without), but this is the first time I'll need to adjust the product. I'll try making this fix and hopefully nothing else breaks. What do we want?Previous releases in servicing:
Currently in 10.0:
My thinking was that this was intentional because @mmitche mentioned we might want to share pre-release servicing builds - which we might want to look like the real servicing build in all ways but the suffix. @mmitche @richlander @jkotas @ViktorHofer -- what do you all think? This is primarily about the behavior of pre-release servicing builds. |
|
Correct, this behavioral change was intentional. We don't stabilize at the repo level anymore. Instead, we flow the configuration for that in as an input parameter to the repo build in the VMR. We don't want individual repos to stabilize as that's costly when publishing packages as that requires a dedicated feed, etc. |
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