Merging internal commits for release/3.1 by vseanreesermsft · Pull Request #43136 · dotnet/corefx

vseanreesermsft · 2022-03-08T19:32:27Z

No description provided.

…ng/internal/dotnet-coreclr This pull request updates the following dependencies [marker]: <> (Begin:e602b4c3-5c4b-44ff-d44b-08d76e1d3434) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr - **Subscription**: e602b4c3-5c4b-44ff-d44b-08d76e1d3434 - **Build**: 20220102.2 - **Date Produced**: January 3, 2022 5:25:41 AM UTC - **Commit**: a9acf95fd9954ecec99f12566ff261e16ff4130a - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk.IL**: [from 3.1.22-servicing.21568.3 to 3.1.23-servicing.22052.2][3] - **Microsoft.NETCore.ILAsm**: [from 3.1.22-servicing.21568.3 to 3.1.23-servicing.22052.2][3] - **Microsoft.NETCore.Runtime.CoreCLR**: [from 3.1.22-servicing.21568.3 to 3.1.23-servicing.22052.2][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr/branches?baseVersion=GC28bb6f9&targetVersion=GCa9acf95&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e602b4c3-5c4b-44ff-d44b-08d76e1d3434)

…o address CVE-2020-8927 [Component Governance](https://dnceng.visualstudio.com/internal/_componentGovernance/dotnet-corefx/alert/5549446?typeId=8301794) identified that we have an insecure version of Brotli in place for .NET Core 2.1, .NET Core 3.1, and .NET 5.0. The vulnerability is surfaced in the BrotliDecoderDecompress method which is used by .NET in our BrotliDecoder.TryDecompress public API. This addresses MSRC 70024. This change was created by backporting the brotli contents as updated in dotnet/runtime#44107, which updated Brotli to v1.0.9 in .NET 6.0 for performance optimizations.

…otnet-coreclr build 20220216.1 Microsoft.NET.Sdk.IL , Microsoft.NETCore.ILAsm , Microsoft.NETCore.Runtime.CoreCLR From Version 3.1.23-servicing.22052.2 -> To Version 3.1.23-servicing.22116.1

…rors coming from the internal repos

Revert "adding a bunch more duplicates of dotnet3 in hopes of delaying the errors coming from the internal repos" This reverts commit 9fbce46. Revert "reordered package sources" This reverts commit 01b4f91. Revert "moved automated package source section below static package sources" This reverts commit 131ce76.

…rrors add patch from https://github.com/dotnet/source-build/blob/release/3.1/patches/corefx/0010-workaround-unsafe-for-cross-compilation-error.patch

… to be one that exists.

…ng/internal/dotnet-coreclr This pull request updates the following dependencies [marker]: <> (Begin:e602b4c3-5c4b-44ff-d44b-08d76e1d3434) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr - **Subscription**: e602b4c3-5c4b-44ff-d44b-08d76e1d3434 - **Build**: 20220216.1 - **Date Produced**: February 17, 2022 12:48:34 AM UTC - **Commit**: 0dee78f90fc80c0fa4390ac1ba519c679bd503a4 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk.IL**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1] - **Microsoft.NETCore.ILAsm**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1] - **Microsoft.NETCore.Runtime.CoreCLR**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr/branches?baseVersion=GCa9acf95&targetVersion=GC0dee78f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e602b4c3-5c4b-44ff-d44b-08d76e1d3434)

…-merge-3.1-2022-03-08-1132

bartonjs · 2022-03-10T21:55:21Z

@mmitche

.packages\microsoft.dotnet.helix.sdk\2.0.0-beta.21552.6\tools\Microsoft.DotNet.Helix.Sdk.MonoQueue.targets(47,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) ArgumentException: Unknown QueueId. Check that authentication is used and user is in correct groups.
   at Microsoft.DotNet.Helix.Client.HelixApi.HandleFailedRequest(RestApiException ex) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/HelixApi.cs:line 33
   at Microsoft.DotNet.Helix.Client.Job.OnNewFailed(HttpRequestMessage req, HttpResponseMessage res) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 211
   at Microsoft.DotNet.Helix.Client.Job.NewInternalAsync(JobCreationRequest body, String idempotencyKey, CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 279
   at Microsoft.DotNet.Helix.Client.Job.NewAsync(JobCreationRequest body, String idempotencyKey, CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 192
   at Microsoft.DotNet.Helix.Client.HelixApi.RetryAsync[T](Func`1 function, Action`1 logRetry, Func`2 isRetryable, CancellationToken cancellationToken)
   at Microsoft.DotNet.Helix.Client.JobDefinition.SendAsync(Action`1 log) in /_/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs:line 217
   at Microsoft.DotNet.Helix.Sdk.SendHelixJob.ExecuteCore(CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs:line 233
   at Microsoft.DotNet.Helix.Sdk.HelixTask.Execute() in /_/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs:line 53
RestApiException: The response contained an invalid status code 400 Bad Request

Body: {"Message":"Unknown QueueId. Check that authentication is used and user is in correct groups.","ActivityId":"8b98852e9d4f8641a29ed3caabc19d8f"}

Does that mean we need to update the queue we're sending something to? Or just keep jamming on retry?

mmitche · 2022-03-10T22:03:14Z

@mmitche

.packages\microsoft.dotnet.helix.sdk\2.0.0-beta.21552.6\tools\Microsoft.DotNet.Helix.Sdk.MonoQueue.targets(47,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) ArgumentException: Unknown QueueId. Check that authentication is used and user is in correct groups.
   at Microsoft.DotNet.Helix.Client.HelixApi.HandleFailedRequest(RestApiException ex) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/HelixApi.cs:line 33
   at Microsoft.DotNet.Helix.Client.Job.OnNewFailed(HttpRequestMessage req, HttpResponseMessage res) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 211
   at Microsoft.DotNet.Helix.Client.Job.NewInternalAsync(JobCreationRequest body, String idempotencyKey, CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 279
   at Microsoft.DotNet.Helix.Client.Job.NewAsync(JobCreationRequest body, String idempotencyKey, CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/Job.cs:line 192
   at Microsoft.DotNet.Helix.Client.HelixApi.RetryAsync[T](Func`1 function, Action`1 logRetry, Func`2 isRetryable, CancellationToken cancellationToken)
   at Microsoft.DotNet.Helix.Client.JobDefinition.SendAsync(Action`1 log) in /_/src/Microsoft.DotNet.Helix/JobSender/JobDefinition.cs:line 217
   at Microsoft.DotNet.Helix.Sdk.SendHelixJob.ExecuteCore(CancellationToken cancellationToken) in /_/src/Microsoft.DotNet.Helix/Sdk/SendHelixJob.cs:line 233
   at Microsoft.DotNet.Helix.Sdk.HelixTask.Execute() in /_/src/Microsoft.DotNet.Helix/Sdk/HelixTask.cs:line 53
RestApiException: The response contained an invalid status code 400 Bad Request

Body: {"Message":"Unknown QueueId. Check that authentication is used and user is in correct groups.","ActivityId":"8b98852e9d4f8641a29ed3caabc19d8f"}

Does that mean we need to update the queue we're sending something to? Or just keep jamming on retry?

I'm thinking one of the target queues is no longer available. I think it's Windows.Nano.1809.Amd64.Open, and should be removed. /cc @dotnet/dnceng

bartonjs · 2022-03-10T22:28:49Z

It looks like other Windows configurations ran seem to have hit two distinct failures, System.IO.Ports.Tests.OpenDevices.OpenDevices01 failed with an access denied error (or, rather, "unknown error 5"), and a slightly scary sounding System.SpanTests.SpanTests.TestMatchFour_Char failure.

Since the queue error isn't caused by this syncup, it feels like we should just take the merge and fix things directly on the release/3.1 branch. Thoughts?

vseanreesermsft · 2022-03-10T22:34:46Z

We can merge it. That's fine. I did add a change removing the nano queue. We can revert that first if necessary.

jozkee · 2022-03-10T23:00:26Z

System.IO.Ports.Tests.OpenDevices.OpenDevices01 failed with an access denied error (or, rather, "unknown error 5")

Known intermittent issue dotnet/runtime#62068, you can ignore.

michellemcdaniel · 2022-03-10T23:03:09Z

I'm thinking one of the target queues is no longer available. I think it's Windows.Nano.1809.Amd64.Open, and should be removed. /cc @dotnet/dnceng

Yeah, that queue is definitely gone. I think we have some docker containers that could be used, but otherwise it should be removed.

ericstj · 2022-03-10T23:08:36Z

Known intermittent issue dotnet/runtime#62068, you can ignore.

We shouldn't ignore these. I'll put up a separate PR to bring the test fix back. dotnet/runtime@100618b. Posted #43137

ericstj · 2022-03-11T00:28:03Z

Builds are succeeding. All failures here are tests. Thanks for merging @vseanreesermsft

System.IO.Ports.Tests.OpenDevices.OpenDevices01 will be addressed in #43137

OSX failures:
System.Drawing.Tests.FontFamilyTests.Families_Get_ReturnsExpected is dotnet/runtime#40937 -- that needs to be ported to 3.1
System.Security.Cryptography.X509Certificates.Tests.CollectionTests.X509ChainElementCollection_IndexerVsEnumerator
System.Security.Cryptography.X509Certificates.Tests.ChainTests.VerifyExpiration_LocalTime
System.Security.Cryptography.X509Certificates.Tests.ChainTests.BuildChain
Not sure about these. @bartonjs have a look if you can notice a test fix to port.

MattGal · 2022-03-11T00:34:09Z

I'm thinking one of the target queues is no longer available. I think it's Windows.Nano.1809.Amd64.Open, and should be removed. /cc @dotnet/dnceng

Yeah, that queue is definitely gone. I think we have some docker containers that could be used, but otherwise it should be removed.

If you want to send work to similar queues, you'd use
(windows.nano.1809.amd64)windows.10.amd64.serverrs5@mcr.microsoft.com/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-20200804014859-56c6673 for internal,
and
(windows.nano.1809.amd64.open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-20200804014859-56c6673 for public.

(What this means is using the newer docker-based means of referencing Nano on a normal Windows, versus actually running Helix in Nano, which was problematic)

That said, I don't think we'd be fixing any issues arising from only being broken on Nano, so the "right thing to do" is likely to remove usage.

bartonjs · 2022-03-11T01:42:24Z

System.Security.Cryptography.X509Certificates.Tests.ChainTests.BuildChain (etc)
Not sure about these. @bartonjs have a look if you can notice a test fix to port.

Opened the porting PR several weeks ago, it just never got reviewed/merged (#43132)

dotnet-bot and others added 16 commits December 8, 2021 18:49

Merge in 'release/3.1' changes

7395b0d

Merge in 'release/3.1' changes

f3f1e2b

Merge in 'release/3.1' changes

97a842b

Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…

28caa77

…otnet-coreclr build 20220216.1 Microsoft.NET.Sdk.IL , Microsoft.NETCore.ILAsm , Microsoft.NETCore.Runtime.CoreCLR From Version 3.1.23-servicing.22052.2 -> To Version 3.1.23-servicing.22116.1

moved automated package source section below static package sources

131ce76

reordered package sources

01b4f91

adding a bunch more duplicates of dotnet3 in hopes of delaying the er…

9fbce46

…rors coming from the internal repos

Update macos pool

1c0caac

in cmake for Native/Unix only warn for no-poison-system-directories e…

11e3b6f

…rrors add patch from https://github.com/dotnet/source-build/blob/release/3.1/patches/corefx/0010-workaround-unsafe-for-cross-compilation-error.patch

Don't do .open queue helix testing on internal PRs ,fix up OSX queues…

6af1cbc

… to be one that exists.

Something removed isInternalBuild, just check project name

c281659

Merge commit '641ee87bc17bd8307682c4677c10e0eb33906c0d' into internal…

bdb2d2e

…-merge-3.1-2022-03-08-1132

remove nano queues

8ebe7bb

vseanreesermsft merged commit bfa6878 into dotnet:release/3.1 Mar 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging internal commits for release/3.1#43136

Merging internal commits for release/3.1#43136
vseanreesermsft merged 17 commits into
dotnet:release/3.1from
vseanreesermsft:internal-merge-3.1-2022-03-08-1132

vseanreesermsft commented Mar 8, 2022

Uh oh!

bartonjs commented Mar 10, 2022

Uh oh!

mmitche commented Mar 10, 2022

Uh oh!

bartonjs commented Mar 10, 2022

Uh oh!

vseanreesermsft commented Mar 10, 2022

Uh oh!

jozkee commented Mar 10, 2022

Uh oh!

michellemcdaniel commented Mar 10, 2022 •

edited

Loading

Uh oh!

ericstj commented Mar 10, 2022 •

edited

Loading

Uh oh!

ericstj commented Mar 11, 2022

Uh oh!

MattGal commented Mar 11, 2022

Uh oh!

bartonjs commented Mar 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

vseanreesermsft commented Mar 8, 2022

Uh oh!

bartonjs commented Mar 10, 2022

Uh oh!

mmitche commented Mar 10, 2022

Uh oh!

bartonjs commented Mar 10, 2022

Uh oh!

vseanreesermsft commented Mar 10, 2022

Uh oh!

jozkee commented Mar 10, 2022

Uh oh!

michellemcdaniel commented Mar 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ericstj commented Mar 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ericstj commented Mar 11, 2022

Uh oh!

MattGal commented Mar 11, 2022

Uh oh!

bartonjs commented Mar 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

michellemcdaniel commented Mar 10, 2022 •

edited

Loading

ericstj commented Mar 10, 2022 •

edited

Loading