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/arcade #97087

Merged
merged 32 commits into from
Jan 22, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 17, 2024

This pull request updates the following dependencies

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

  • Subscription: c32383ee-d79c-4435-5b63-08d8d8feb47e
  • Build: 20240119.2
  • Date Produced: January 19, 2024 1:45:17 PM UTC
  • Commit: abddd0bd5145578246dcadda264c7557f2a935a9
  • Branch: refs/heads/main

…116.3

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jan 17, 2024
@ViktorHofer
Copy link
Member

Looking at the XUNIT_SPAN related failures.

dotnet-maestro bot and others added 3 commits January 17, 2024 13:06
…116.3

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3
@ViktorHofer
Copy link
Member

@dotnet/source-build-internal can you please help us diagnose the source build issues in this dependency upgrade?

/__w/1/s/artifacts/sb/package-cache/microsoft.dotnet.genfacades/9.0.0-beta.24066.3/build/Microsoft.DotNet.GenFacades.NotSupported.targets(56,5): error MSB4018: The "NotSupportedAssemblyGenerator" task failed unexpectedly. [/__w/1/s/artifacts/sb/src/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj::TargetFramework=net9.0]
/__w/1/s/artifacts/sb/package-cache/microsoft.dotnet.genfacades/9.0.0-beta.24066.3/build/Microsoft.DotNet.GenFacades.NotSupported.targets(56,5): error MSB4018: System.BadImageFormatException: Could not load file or assembly 'Microsoft.CodeAnalysis, Version=4.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'. Reference assemblies cannot be loaded for execution. (0x80131058) [/__w/1/s/artifacts/sb/src/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj::TargetFramework=net9.0]
/__w/1/s/artifacts/sb/package-cache/microsoft.dotnet.genfacades/9.0.0-beta.24066.3/build/Microsoft.DotNet.GenFacades.NotSupported.targets(56,5): error MSB4018: File name: 'Microsoft.CodeAnalysis, Version=4.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' ---> System.BadImageFormatException: Could not load file or assembly 'Microsoft.CodeAnalysis, Version=4.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL'. Reference assemblies cannot be loaded for execution. (0x80131058) [/__w/1/s/artifacts/sb/src/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj::TargetFramework=net9.0]
/__w/1/s/artifacts/sb/package-cache/microsoft.dotnet.genfacades/9.0.0-beta.24066.3/build/Microsoft.DotNet.GenFacades.NotSupported.targets(56,5): error MSB4018: File name: 'Microsoft.CodeAnalysis, Version=4.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL' ---> System.BadImageFormatException: Cannot load a reference assembly for execution

@mthalman
Copy link
Member

mthalman commented Jan 17, 2024

I initially suspected that the Microsoft.DotNet.GenFacades package was carrying along a reference assembly version of Microsoft.CodeAnalysis.dll but that isn't the case; it's carrying an implementation assembly. So now the hunt is on to find where this is coming from.

@mthalman
Copy link
Member

I initially suspected that the Microsoft.DotNet.GenFacades package was carrying along a reference assembly version of Microsoft.CodeAnalysis.dll but that isn't the case; it's carrying an implementation assembly. So now the hunt is on to find where this is coming from.

Ok, I was looking at the wrong package. I needed the SourceBuild intermediates package. So yes, I've confirmed this is coming from the source-built Microsoft.DotNet.GenFacades package. It's pulling in the package from SBRP. I'll investigate further on how to resolve the issue.

@mthalman
Copy link
Member

This is related to dotnet/source-build-reference-packages#858. Prior to that change, we were getting a prebuilt but it was pulling in the implementation version of Microsoft.CodeAnalysis.dll. Now it's loading it from SBRP because it exists there and getting the reference assembly version. Using the package from SBRP is seemingly the correct thing to do here.

My knowledge on NuGet package authoring isn't all that great. In my mind, it would seem this could be solved by having Microsoft.DotNet.GenFacades have a package reference to Microsoft.CodeAnalysis.CSharp instead of redistributing the DLLs in its own package. But I don't know enough about how to author that. Does that seem like the right thing to do? /cc @MichaelSimons @ViktorHofer @mmitche

@ViktorHofer
Copy link
Member

MSBuild task packages can't have package references. They need to redistribute their dependencies within the package. Usually msbuild task artifacts are in a folder outside of "lib", i.e. "tools" that NuGet and the SDK ignores.

@ViktorHofer
Copy link
Member

Looks like this isn't the first time we encounter this issue for GenFacades: dotnet/arcade#13681

ViktorHofer added a commit to dotnet/arcade that referenced this pull request Jan 17, 2024
We already require a VS 17.8 installation so the version bump shouldn't cause any min version requirement issues. This should unblock dotnet/runtime#97087
@ViktorHofer
Copy link
Member

While this is an re-occurring issue, I submitted dotnet/arcade#14383 as a workaround to unblock builds meanwhile. We did the same with dotnet/arcade#13681

@dotnet-maestro dotnet-maestro bot requested a review from lewing as a code owner January 17, 2024 19:18
@akoeplinger
Copy link
Member

@bradwilson haha yeah good point, we had to reuse a couple deep xunit-internals to get it working on webassembly which can't use threads: https://github.com/dotnet/xharness/blob/fa3b643cc0b028ae875546b7527927adcfcd9348/src/Microsoft.DotNet.XHarness.TestRunners.Xunit/ThreadlessXunitTestRunner.cs#L150

@bradwilson
Copy link

bradwilson commented Jan 19, 2024

@akoeplinger The old signature is back in 2.6.7-pre.6

I did mark is as obsolete so people know to use the one that specifies stopOnFail or not, but that should be fine for ABI.

@akoeplinger akoeplinger added area-codeflow for labeling automated codeflow and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jan 19, 2024
@ViktorHofer
Copy link
Member

Generating native code
ILC: D:\a_work\1\s\src\coreclr\jit\importercalls.cpp:4106
ILC: Assertion failed '!"Unhandled must expand intrinsic, throwing PlatformNotSupportedException"' in 'System.Type:get_IsPrimitive():ubyte:this' during 'Morph - Inlining' (IL size 7; hash 0x30bca526; FullOpts)

cc @MichalStrehovsky

…119.2

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24069.2
@akoeplinger
Copy link
Member

akoeplinger commented Jan 21, 2024

Other variations of that test were already disabled against #84402 so I've disabled building this one too to unblock the PR: #97272

@akoeplinger akoeplinger force-pushed the darc-main-5551d309-34c9-4856-a8f9-48242922b036 branch from ed54bff to 2267a5c Compare January 21, 2024 15:14
@MichalStrehovsky
Copy link
Member

Other variations of that test were already disabled against #84402 so I've disabled building this one too to unblock the PR: #97272

Thank you - I ended up reverting them because there would be no end to test disabling (it was still not passing and we didn't even try /azp run runtime-nativeaot-outeroop yet). Instead, in 36533db I'm marking Type:get_IsPrimitive as NoOptimization. That should work around. This is a JIT issue that I think will be hittable with tiered PGO in non-AOT scenarios too, we're just lucky to hit it in AOT. The details are in the bug for anyone interested.

@MichalStrehovsky
Copy link
Member

This is failing in some Tensor tests that are new as of #97192.

Then I see a known failure in S.T.Json, otherwise it's looking good now. Unfortunately the tensor tests are causing quite some noise so I'm not sure that's the extent of it.

@akoeplinger
Copy link
Member

I think the tensor failures might be due to some xunit changes, I'll take a look locally.

@MichalStrehovsky
Copy link
Member

I think the tensor failures might be due to some xunit changes, I'll take a look locally.

Double check what I'm saying, but I think we're seeing failures in CI legs that did not trigger for the PR that introduced the tests, so this is probably bad in main.

@akoeplinger
Copy link
Member

akoeplinger commented Jan 22, 2024

Yeah you're right we're seeing this in main as well.

@ViktorHofer ViktorHofer merged commit 8726d6b into main Jan 22, 2024
187 of 194 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-5551d309-34c9-4856-a8f9-48242922b036 branch January 22, 2024 10:13
tmds pushed a commit to tmds/runtime that referenced this pull request Jan 23, 2024
* Update dependencies from https://github.com/dotnet/arcade build 20240116.3

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3

* Update Versions.props

* Make xunit.props respect different versions and assert libraries

* Update dependencies from https://github.com/dotnet/arcade build 20240116.3

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24066.3

* Avoid XUNIT_SPAN unambiguous call issues

* Disable obsoletion warning for xunit Delegating*Sink

* Fix nullable collection test

* Fix "DynamicObject_MissingProperty" null test

* Remove unnecessary Extensions references

* Update dependencies from xharness 9.0.0-prerelease.24066.3

* Try to fix TryCatchFinally test for real

* Fix TryCatchFinally for real real

* Update dependencies from https://github.com/dotnet/arcade build 20240117.4

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24067.4

* Fix TryCatchFinally for real real real

* Update dependencies from https://github.com/dotnet/arcade build 20240118.1

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24068.1

* Work around Mono issue in AppDomainTests.AssemblyLoad

* Update dependencies from https://github.com/dotnet/arcade build 20240118.4

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24068.4

* Update dependencies from https://github.com/dotnet/arcade build 20240119.2

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24069.2

* Update xunit.props

* Update xunit.props

* Update dependencies from https://github.com/dotnet/arcade build 20240119.2

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.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24069.2

* Disable DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled test

See dotnet#97272

* Disable AmbiguousImplementationException.ilproj and Pause_ro.csproj too

They also fail with dotnet#97272

* Disable Regression2_Regressions.csproj too

* Revert "Disable Regression2_Regressions.csproj too"

This reverts commit 4a6bdb8.

* Revert "Disable AmbiguousImplementationException.ilproj and Pause_ro.csproj too"

This reverts commit f5729ce.

* Revert "Disable DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled test"

This reverts commit 2267a5c.

* Work around IsPrimitive compilation issue

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
@github-actions github-actions bot locked and limited conversation to collaborators Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants