Skip to content
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] Update dependencies from dotnet/runtime #27149

Merged
merged 25 commits into from
Aug 23, 2022

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 13, 2022

This pull request updates the following dependencies

From https://github.com/dotnet/runtime

  • Subscription: aa69f164-2492-460a-3914-08d8e9750bf8
  • Build: 20220822.24
  • Date Produced: August 23, 2022 9:09:39 AM UTC
  • Commit: bd4bea62d2c8f87ac8190fc14385b8768500eefd
  • Branch: refs/heads/main

…0813.1

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22413.1
@dotnet-maestro
Copy link
Contributor Author

Notification for subscribed users from https://github.com/dotnet/runtime:

@dnr-codeflow

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/runtime) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

1 similar comment
@dotnet-maestro
Copy link
Contributor Author

Notification for subscribed users from https://github.com/dotnet/runtime:

@dnr-codeflow

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/runtime) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

…0813.9

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22413.9
@kasperk81
Copy link
Contributor

@pavelsavara this looks familiar:

Microsoft.NET.Sdk.BlazorWebAssembly.Tests.BlazorWasmStaticWebAssetsIntegrationTest.StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets [FAIL]
Expected subject to be a collection with 235 item(s), but found 247.

…0814.6

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22414.6
@jeffschwMSFT
Copy link
Member

@lewing / @steveisok / @SamMonoRT the wasm tests are hitting a baseline failure. Can you take a look?

https://github.com/dotnet/sdk/blob/main/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs#L359
Expected subject to be a collection with 226 item(s), but found 238.

@pavelsavara
Copy link
Member

@maraf @radical @javiercn

@lewing
Copy link
Member

lewing commented Aug 15, 2022

@javiercn can you have a look at the static web assets tests

@jeffschwMSFT there are several Microsoft.NET.Build.Tests failures that are not wasm related.

@jeffschwMSFT
Copy link
Member

@lewing thanks. They look like restore 429's and will need a rerun once we have the fix for the wasm.

@radical
Copy link
Member

radical commented Aug 15, 2022

@javiercn @TanayParikh do you use some tool to generate the baselines for the blazor tests?

@TanayParikh
Copy link
Contributor

@javiercn @TanayParikh do you use some tool to generate the baselines for the blazor tests?

Yes. I believe it's just a matter of updating:

#if GENERATE_SWA_BASELINES
public static bool GenerateBaselines = true;
#else
public static bool GenerateBaselines = false;
#endif

However, is this change expected?

@radical
Copy link
Member

radical commented Aug 15, 2022

@javiercn @TanayParikh do you use some tool to generate the baselines for the blazor tests?

Yes. I believe it's just a matter of updating:

Could you do that, please?

However, is this change expected?

I wouldn't know.

@TanayParikh
Copy link
Contributor

I can definitely do it, but just want to confirm if this is an expected change. I believe @pavelsavara has been making some changes in this area so he may have additional context?

@radical
Copy link
Member

radical commented Aug 15, 2022

What change are you talking about btw? You linked to:

 #if GENERATE_SWA_BASELINES 
         public static bool GenerateBaselines = true; 
 #else 
         public static bool GenerateBaselines = false; 
 #endif 

This hasn't changed in the last year.

@TanayParikh
Copy link
Contributor

TanayParikh commented Aug 15, 2022

This hasn't changed in the last year.

Essentially just need to add a #define GENERATE_SWA_BASELINES to the top of the file to trigger baseline generation instead of actually running the test.

@radical
Copy link
Member

radical commented Aug 15, 2022

If you share the changes, then I could try to validate them.

@kasperk81
Copy link
Contributor

what is the potential value of test StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets and is it still worth keeping? given how it is broken every other day, it is a constant catch up with "number of items in a manifest which we have no control over in this repository". seems like it is less of a protection (assuming this test has never caught anything useful?) and more of a design flaw hindering automated code flow which forces unnecessary actions from human.

deleting overeager and useless tests should be under consideration.

@maraf
Copy link
Member

maraf commented Aug 16, 2022

I can definitely do it, but just want to confirm if this is an expected change. I believe @pavelsavara has been making some changes in this area so he may have additional context?

Yes, we have added some source .ts and .js files from which the dotnet.js is composed. I'm not sure how exactly it impacts this test.

If you share the changes, then I could try to validate them.

I should be able to validate them too.

…0815.13

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0
 From Version 7.0.0-rc.1.22411.12 -> To Version 7.0.0-rc.1.22415.13
@jeffschwMSFT
Copy link
Member

Thanks for taking a look, who has the next action on this investigation? We are about to snap for RC1 and this will soon become blocking. Thanks

@TanayParikh
Copy link
Contributor

Looks like we're seeing a new error now:

Microsoft.DotNet.Watcher.Tools.GlobbingAppTests.DeleteSourceFolder (and other tests)

Expected command to pass but it did not.
File Name: /root/helix/work/correlation/d/dotnet
Arguments: msbuild /t:Build /root/helix/work/workitem/e/testExecutionDirectory/DeleteSourceF---587A3DCE/WatchGlobbingApp.csproj /restore
Exit Code: 1
StdOut:
MSBuild version 17.4.0-preview-22414-01+50f6081be for .NET
  Determining projects to restore...
/root/helix/work/correlation/d/sdk/7.0.100-ci/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(90,5): error NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. [/root/helix/work/workitem/e/testExecutionDirectory/DeleteSourceF---587A3DCE/WatchGlobbingApp.csproj]
StdErr:

Does anyone have context on this error?

Previously:

Microsoft.NET.Sdk.BlazorWebAssembly.Tests.BlazorWasmStaticWebAssetsIntegrationTest.StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets [FAIL]
Expected subject to be a collection with 235 item(s), but found 247.

Which isn't showing in the CI any longer.

@jeffschwMSFT
Copy link
Member

jeffschwMSFT commented Aug 16, 2022

adding @dotnet/domestic-cat, @LakshanF, and @MichalStrehovsky to see if they have insight into this new error.

�[m�[37m      /root/helix/work/correlation/d/sdk/7.0.100-ci/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(90,5): error NETSDK1083: The specified RuntimeIdentifier 'invalid-rid' is not recognized. [/root/helix/work/workitem/e/testExecutionDirectory/BuildFailsIfI---253526DD_2/RuntimePackNotAvailable/RuntimePackNotAvailable.csproj]
�[m�[37m      /root/helix/work/correlation/d/sdk/7.0.100-ci/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(90,5): error NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. 

@LakshanF
Copy link
Member

LakshanF commented Aug 16, 2022

Likely a test issue? Not sure where the test is though to check.

Both the errors, NETSDK1083 and NETSDK1183 seem valid when rid is "invalid-rid"

@jeffschwMSFT
Copy link
Member

An example is the following:
https://github.com/dotnet/sdk/blob/main/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs#L62

No rid seems to be passed. Was there a recent change in the SDK that requires that (eg. no implicit rid any longer)?

@jeffschwMSFT
Copy link
Member

Lakshan and I took a deeper look. It seems that one of the errors is a red herring (as the test is expecting that), the other implies a restore failure - so rerunning.

@jeffschwMSFT
Copy link
Member

This failure is durable:

    > C:\h\w\B18109B0\p\d\dotnet.exe msbuild /t:Publish C:\h\w\B18109B0\t\dotnetSdkTests\mruxzlnv.mbh\AoT_Publish_W---DA56BF44\blazorwasm\blazorwasm.csproj /restore /p:Configuration=Release
    MSBuild version 17.4.0-preview-22414-01+50f6081be for .NET
      Determining projects to restore...
    C:\h\w\B18109B0\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(90,5): error NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. [C:\h\w\B18109B0\t\dotnetSdkTests\mruxzlnv.mbh\AoT_Publish_W---DA56BF44\blazorwasm\blazorwasm.csproj]

Given this Wasm, I am not sure why this error is firing. @lewing?

@radical
Copy link
Member

radical commented Aug 16, 2022

This failure is durable:

    > C:\h\w\B18109B0\p\d\dotnet.exe msbuild /t:Publish C:\h\w\B18109B0\t\dotnetSdkTests\mruxzlnv.mbh\AoT_Publish_W---DA56BF44\blazorwasm\blazorwasm.csproj /restore /p:Configuration=Release
    MSBuild version 17.4.0-preview-22414-01+50f6081be for .NET
      Determining projects to restore...
    C:\h\w\B18109B0\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(90,5): error NETSDK1183: Unable to optimize assemblies for Ahead of time compilation: a valid runtime package was not found. Either set the PublishAot property to false, or use a supported runtime identifier when publishing. When targeting .NET 7 or higher, make sure to restore packages with the PublishAot property set to true. [C:\h\w\B18109B0\t\dotnetSdkTests\mruxzlnv.mbh\AoT_Publish_W---DA56BF44\blazorwasm\blazorwasm.csproj]

Given this Wasm, I am not sure why this error is firing. @lewing?

Does this generate bin logs, and can I access those?

@TanayParikh
Copy link
Contributor

TanayParikh commented Aug 22, 2022

It would be great if it also outputted which expected items weren't in the collection.
it would be nice if they would not only print out the differing files, but also printed out steps to update the baseline

Seems reasonable, creating an issue to track this.

Edit: dotnet/aspnetcore#43834

StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets is the most fragile and useless test

It's not an issue with a single test. It's a collection of baselines. That may just be the first in sorted order.

@eerhardt
Copy link
Member

Looks like this is due to the dotnet-crypto-worker file

Can you give some more context? What is due to it?

@TanayParikh
Copy link
Contributor

Looks like this is due to the dotnet-crypto-worker file

Can you give some more context? What is due to it?

  "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.7.0.0-rc.1.22411.12.[[hash]].js",
  "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.7.0.0-rc.1.22411.12.[[hash]].js.br",
  "${ProjectPath}\\blazorhosted\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\_framework\\dotnet-crypto-worker.7.0.0-rc.1.22411.12.[[hash]].js.gz",

are being added to the baselines when I regenerate them. I can put up a PR with these updated baselines, but wasn't sure if #27303 would mean these files would subsequently be no longer expected (thereby failing the baselines, and requiring a revert).

@eerhardt
Copy link
Member

dotnet-crypto-worker.7.0.0-rc.1.22411.12.

This is main, shouldn't those be 8.0.0 baselines? I think we are using the wrong runtime version in those tests.

@TanayParikh
Copy link
Contributor

TanayParikh commented Aug 22, 2022

dotnet-crypto-worker.7.0.0-rc.1.22411.12.

This is main, shouldn't those be 8.0.0 baselines? I think we are using the wrong runtime version in those tests.

I may've been using an older SDK build to generate those. Regardless, the specific version isn't necessarily of concern here given it'll get swapped out for the ${RuntimeVersion} placeholder in the final baseline. It's more so a question of whether the crypto worker files should be added to the baseline (or not given #27303).

When I true to build the sdk from main, I get: SDK Stage 0 has more than one folder with templates. Anyone familiar with this error?

@eerhardt
Copy link
Member

Regardless, the specific version isn't necessarily of concern here

It IS a concern because if you are using the older runtime version, it will have the dotnet-crypto-worker.js file. And if you are using the newer runtime version, it won't.

@TanayParikh
Copy link
Contributor

TanayParikh commented Aug 23, 2022

Regardless, the specific version isn't necessarily of concern here

It IS a concern because if you are using the older runtime version, it will have the dotnet-crypto-worker.js file. And if you are using the newer runtime version, it won't.

Ah okay, thanks for the clarification! Will take another look tomorrow.

In that case, given the CI is failing, that seems to indicate that some other file is being added (I saw the dotnet-crypto-worker.js file, however as you pointed out that's due to the SDK version I'm using).

Edit; if anyone can advise on:

When I true to build the sdk from main, I get: SDK Stage 0 has more than one folder with templates. Anyone familiar with this error?

It would be much appreciated!

@danmoseley
Copy link
Member

@marcpopMSFT can you help with @TanayParikh question above?

@TanayParikh
Copy link
Contributor

TanayParikh commented Aug 23, 2022

@MackinnonBuck was able to run the last round of baseline generation without issue. This may be a local issue on my end, @MackinnonBuck if you still have the environment setup from last week do you mind re-running the baseline generation?

dotnet-maestro bot and others added 3 commits August 23, 2022 12:20
…0822.24

Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 7.0.0-rc.1.22411.12 -> To Version 8.0.0-alpha.1.22422.24
@eerhardt
Copy link
Member

The errors I'm seeing look like:

      "C:\h\w\B31A09A8\t\dotnetSdkTests\fddqv3yc.zbc\It_embeds_sin---38A77651\ComServerWithTypeLibs.csproj" (Build target) (1:7) ->
      (_GenerateClsidMap target) -> 
        C:\h\w\B31A09A8\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(639,5): error MSB4018: The "GenerateClsidMap" task failed unexpectedly. [C:\h\w\B31A09A8\t\dotnetSdkTests\fddqv3yc.zbc\It_embeds_sin---38A77651\ComServerWithTypeLibs.csproj]
      C:\h\w\B31A09A8\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(639,5): error MSB4018: System.MissingMethodException: Method not found: 'Void Microsoft.NET.HostModel.ComHost.ClsidMap.Create(System.Reflection.Metadata.MetadataReader, System.String)'. [C:\h\w\B31A09A8\t\dotnetSdkTests\fddqv3yc.zbc\It_embeds_sin---38A77651\ComServerWithTypeLibs.csproj]
      C:\h\w\B31A09A8\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(639,5): error MSB4018:    at Microsoft.NET.Build.Tasks.GenerateClsidMap.ExecuteCore() [C:\h\w\B31A09A8\t\dotnetSdkTests\fddqv3yc.zbc\It_embeds_sin---38A77651\ComServerWithTypeLibs.csproj]
      C:\h\w\B31A09A8\p\d\sdk\7.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.targets(639,5): error MSB4018:    at Microsoft.NET.Build.Tasks.TaskBase.Execute() in /_/src/Tasks/Common/TaskBase.cs:line 49 [C:\h\w\B31A09A8\t\dotnetSdkTests\fddqv3yc.zbc\It_embeds_sin---38A77651\ComServerWithTypeLibs.csproj]

Is that caused from 6.0.0 -> 6.0.1? Or the update from 5.0.0 -> 6.0.1?

cc @MichalStrehovsky @rainersigwald

@am11
Copy link
Member

am11 commented Aug 23, 2022

@eerhardt, I updated Reflection.Metadata version in HostModel in dotnet/runtime to 6.0.0 in order to stay in sync with version used by SDK and MSBuild repos, meanwhile SDK was updated to 6.0.1, so we just need to git revert c53cffbd04158f12e1d4c7f7fd0f0d948f7ae776.

eerhardt and others added 3 commits August 23, 2022 10:49
…ing that Microsoft.NET.Build.Tasks doesn't load S.R.M 6.0.0.1 while HostModel uses MSBuild's 6.0.0.0 copy
…ub.com:dotnet/sdk into darc-main-b89ef279-c278-4e48-9a05-29840bb46c47
@jkoritzinsky
Copy link
Member

@eerhardt I've got the S.R.M situation handled. I'll fix it

@marcpopMSFT
Copy link
Member

appreciated

@danmoseley , I'd ping the template engine folks for that one. Sounds like ending up in a state with too many templates. That could be because of our transition to 8.0 which is still in progress.

@danmoseley
Copy link
Member

@dotnet/templating-engine-maintainers can you help with error above blocking codeflow?

@danmoseley
Copy link
Member

@TanayParikh it looks like we are on track to be green though. can we merge at that point ? I'm not clear whether that error is blocking.

@marcpopMSFT
Copy link
Member

If all the tests pass, I'd merge and we can fix forward if there are further issues to address (as a lot of work went into this PR to get it green). Main is going to be in an odd state for a few weeks anyway.

@TanayParikh
Copy link
Contributor

it looks like we are on track to be green though. can we merge at that point ?

Looks good to me!

@marcpopMSFT marcpopMSFT merged commit 88ee279 into main Aug 23, 2022
@marcpopMSFT marcpopMSFT deleted the darc-main-b89ef279-c278-4e48-9a05-29840bb46c47 branch August 23, 2022 21:41
@danmoseley
Copy link
Member

Yay good job all.

@TanayParikh
Copy link
Contributor

🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.