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.

Sign up for GitHub

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

Jump to bottom

[release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade #66144

Merged
merged 10 commits into from
Mar 14, 2022
Merged

[release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade #66144

merged 10 commits into from
Mar 14, 2022

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 3, 2022 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 36974d0f-1ebe-4d41-3a49-08d961c5a689
  • Build: 20220311.1
  • Date Produced: March 11, 2022 9:02:12 PM UTC
  • Commit: 879df783283dfb44c7653493fdf7fd7b07ba6b01
  • Branch: refs/heads/release/6.0

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

  • Subscription: 662e2218-ac3b-45e0-0adc-08d961c5a36b
  • Build: 20220311.2
  • Date Produced: March 11, 2022 7:37:06 PM UTC
  • Commit: 52e9452f82e26f9fcae791e84c082ae22f1ef66f
  • Branch: refs/heads/release/6.0

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 2022022…
ab6cfe4 
….7

Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk
 From Version 2.5.1-beta.22107.2 -> To Version 2.5.1-beta.22122.7
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow label Mar 3, 2022
This was referenced Mar 3, 2022
Closed
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202203…
0125ff8 
…08.1

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.2 -> To Version 6.0.3
@dotnet-maestro dotnet-maestro bot changed the title [release/6.0] Update dependencies from dotnet/arcade [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk Mar 8, 2022
Steve Pfister and others added 4 commits March 8, 2022 19:48
Merge remote-tracking branch 'upstream/release/6.0' into darc-release…
4e43f28 
…/6.0-0d39ad62-41fa-42a2-9cf2-40b93688c37f
Fix weird character problem
f9be63d
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202203…
16f29c9 
…08.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.2 -> To Version 6.0.4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
8369817 
…309.8

Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk
 From Version 2.5.1-beta.22107.2 -> To Version 2.5.1-beta.22159.8
@dotnet-maestro dotnet-maestro bot changed the title [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk [release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade Mar 10, 2022
@akoeplinger akoeplinger changed the title [release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade [release/6.0] Update dependencies from dotnet/arcade Mar 10, 2022
@akoeplinger
Copy link
Member

@mmitche I believe we need this for the sbom changes, is someone keeping an eye on this and making sure it gets merged?

@ericstj
Copy link
Member

ericstj commented Mar 10, 2022

There are some real build failures here that need to be addressed before merging.

https://dev.azure.com/dnceng/public/_build/results?buildId=1657305&view=logs&j=81a0f8c2-d4db-561f-9b8e-3f045280d7fe&t=2a104984-c43b-5b93-1361-6bd8a1e96b04&l=1783

This is another instance of the bug that was worked around here: #61697

To fix it for good we need dotnet/sdk#22353 cc @joperezr

For now I can workaround it by disabling PackageValidation for anything that's not a csproj.

@ericstj
On run package validation for CSProj-built packages
5dd4c0a 
This fixes an issue where a non-CSProj built package would load
MS.CA.dll , then a CSProj would try to load MS.CA.CS.dll of a different
version and it's MS.CA types would not agree with those already bound
to the task from previous load.

Further details:
dotnet/sdk#22277
@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

Actually that's a better workaround than the two already in place so I cleaned them up. CC @joperezr

@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

This source build failure is concerning:
https://dev.azure.com/dnceng/public/_build/results?buildId=1657699&view=logs&j=000ba8e3-34f8-51d2-8d06-9b61f10256d0&t=ca9b6e26-8c16-57f9-673e-2bc0dc655f25&l=11937

  /__w/1/s/artifacts/source-build/self/src/src/libraries/ref.proj(68,5): error MSB4062: The "CreateFrameworkListFile" task could not be loaded from the assembly /__w/1/s/artifacts/source-build/self/package-cache/microsoft.dotnet.sharedframework.sdk/6.0.0-beta.22159.8/sdk/../tools/net6.0/Microsoft.DotNet.SharedFramework.Sdk.dll. Could not load file or assembly '/__w/1/s/artifacts/source-build/self/package-cache/microsoft.dotnet.sharedframework.sdk/6.0.0-beta.22159.8/tools/net6.0/Microsoft.DotNet.SharedFramework.Sdk.dll'. The system cannot find the file specified.
  /__w/1/s/artifacts/source-build/self/src/src/libraries/ref.proj(68,5): error MSB4062:  Confirm that the <UsingTask> declaration is correct, that the assembly and all its dependencies are available, and that the task contains a public class that implements Microsoft.Build.Framework.ITask.

@dagood is it possible there is a source build issue here? Best I can tell we're probably consuming a package from arcade that wasn't built with source-build: https://github.com/dotnet/arcade/blob/4f4c8c392d1c51e630f4571e39a095da7fb172c5/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj#L5

@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

Android failures are #65840, just need an answer on source-build failure to merge this.

@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

@crummel @MichaelSimons for source build

@crummel
Copy link
Contributor

crummel commented Mar 11, 2022

Taking a look now.

@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

So this is just hitting us now because of dotnet/arcade@5f2a9f5

There is another place that needs to react to that change:

runtime/src/workloads/workloads.csproj

Lines 5 to 8 in d008c6f

<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>

To unblock this I'll add a condition to the projects that use the SharedFramework SDK to fallback to a different folder if the task doesn't exist.

@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

So it looks like this is working in main because of dotnet/arcade#8355. cc @akoeplinger
Which is effectively what I suggested here but in Arcade. While this works around the issue, it's concerning that we aren't actually using Arcade's source-built packages when we think we are. I noticed in the sourcebuild binlog that arcade itself is not using the sourcebuilt version, and moreover it's targets aren't even set up to ever do so which leads me to believe we don't ever use the source-built arcade SDK.

@ericstj ericstj mentioned this pull request Mar 11, 2022
Closed
@ericstj
Copy link
Member

ericstj commented Mar 11, 2022

Chatted with @mmitche. There is time for 6.0 - we'll wait on dotnet/arcade#8597.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202203…
064747b 
…11.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.200 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300
 From Version 6.0.4 -> To Version 6.0.4
@dotnet-maestro dotnet-maestro bot changed the title [release/6.0] Update dependencies from dotnet/arcade [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk Mar 11, 2022
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
8e04daa 
…311.1

Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk
 From Version 2.5.1-beta.22107.2 -> To Version 2.5.1-beta.22161.1
@dotnet-maestro dotnet-maestro bot changed the title [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk [release/6.0] Update dependencies from dotnet/emsdk dotnet/arcade Mar 12, 2022
@ericstj
Copy link
Member

ericstj commented Mar 14, 2022

@mmitche @carlossanlop -- I think this needs to be merged, not sure what state the builds are in.

@mmitche mmitche merged commit 2eb4efb into release/6.0 Mar 14, 2022
@dotnet-maestro dotnet-maestro bot deleted the darc-release/6.0-0d39ad62-41fa-42a2-9cf2-40b93688c37f branch March 14, 2022 02:49
@ghost ghost locked as resolved and limited conversation to collaborators Apr 13, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@akoeplinger akoeplinger akoeplinger approved these changes

Assignees
No one assigned
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@akoeplinger @ericstj @crummel @mmitche