Skip to content

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic dotnet/emsdk #67436

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
Closed
wants to merge 19 commits into from
Closed

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic dotnet/emsdk #67436

wants to merge 19 commits into from

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 1, 2022 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: c32383ee-d79c-4435-5b63-08d8d8feb47e
  • Build: 20220331.2
  • Date Produced: March 31, 2022 3:37:49 PM UTC
  • Commit: e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
  • Branch: refs/heads/main
  • Updates to .NET SDKs:
    • Updates sdk.version to 7.0.100-preview.2.22153.17
    • Updates tools.dotnet to 7.0.100-preview.2.22153.17

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

  • Subscription: be30ac4f-4b72-4287-1eb6-08d8d8fef0ea
  • Build: 20220331.1
  • Date Produced: March 31, 2022 12:00:23 PM UTC
  • Commit: 6bca5cc
  • Branch: refs/heads/main

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

  • Subscription: 2c02cca6-9dfc-41ac-a21d-08d94c99dc63
  • Build: 20220331.2
  • Date Produced: March 31, 2022 2:04:26 PM UTC
  • Commit: 417bdeac3988ec59ee7f6c045ae03d2193bcdab0
  • Branch: refs/heads/main

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

  • Subscription: c22d5069-447c-4252-29fd-08d90a7bb4bc
  • Build: 2022040.2
  • Date Produced: April 1, 2022 9:09:33 PM UTC
  • Commit: eb809c8854de4d1bdf227a55550af01a1bb38e4b
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
081bb4e 
…331.2

Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22181.2
@ghost ghost added the area-codeflow for labeling automated codeflow label Apr 1, 2022
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
bbb54ba 
…20331.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.22180.1 -> To Version 1.0.0-prerelease.22181.1
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade [main] Update dependencies from dotnet/arcade dotnet/xharness Apr 1, 2022
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msquic build 20220…
ccd828f 
…331.2

System.Net.MsQuic.Transport
 From Version 7.0.0-alpha.1.22173.2 -> To Version 7.0.0-alpha.1.22181.2
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/xharness [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic Apr 1, 2022
@akoeplinger
Copy link
Member

@agocke looks like crossgen fails because it's not finding a 6.0.0 shared framework (this PR bumps to the 7.0 SDK), do you know who could take a look at that:

 /__w/1/s/dotnet.sh /__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/crossgen2/crossgen2.dll -o:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/System.Private.CoreLib.dll -r:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/IL/*.dll --targetarch:x64 -m:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/StandardOptimizationData.mibc -m:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/StandardOptimizationData.mibc -m:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/StandardOptimizationData.mibc -m:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/StandardOptimizationData.mibc --embed-pgo-data -O /__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/IL/System.Private.CoreLib.dll --perfmap-format-version:1 --perfmap --perfmap-path:/__w/1/s/artifacts/bin/coreclr/Linux.x64.Release/
  It was not possible to find any compatible framework version
  The framework 'Microsoft.NETCore.App', version '6.0.0' (x64) was not found.
    - The following frameworks were found:
        7.0.0-preview.2.22152.2 at [/__w/1/s/.dotnet/shared/Microsoft.NETCore.App]
  
  You can resolve the problem by installing the specified framework and/or SDK.
  
  The specified framework can be found at:
    - https://aka.ms/dotnet-core-applaunch?framework=Microsoft.NETCore.App&framework_version=6.0.0&arch=x64&rid=centos.7-x64

@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 2022040.2
cd17f2d 
Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.4.22178.1 -> To Version 7.0.0-preview.4.22201.2
@dotnet-maestro dotnet-maestro bot changed the title [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic [main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/msquic dotnet/emsdk Apr 1, 2022
hoyosjs
hoyosjs requested changes Apr 2, 2022
View reviewed changes
Copy link
Member

@hoyosjs hoyosjs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a no merge block since this should go on batched rollout due to SDK upgrade. cc: @dotnet/runtime-infrastructure

@ghost ghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label Apr 2, 2022
@ghost ghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label Apr 2, 2022
@hoyosjs
Copy link
Member

hoyosjs commented Apr 2, 2022

This one should also consider the changes coming in in dotnet/xharness#851. I have a bunch of other local changes moving pieces of crossgen (@mangod9, @trylek, @AntonLapounov) and several pieces of WASM and devices props/targets (@steveisok @lewing @akoeplinger). One question I had is why are these not using NetCoreAppToolCurrent/TargetFrameworkForNETCoreTasks and instead using a props local _TargetFrameworkForNETCoreTasks. Also, are there any objections to moving those props from src\tasks\Directory.Build.props to Directory.Build.props just to have them grouped and make SDK upgrades like this easier?

@danmoseley
Copy link
Member 

/datadisks/disk1/work/C93B0A7C/p/build/wasm/WasmApp.targets(247,5): error MSB4062: The "RuntimeConfigParserTask" task could not be loaded from the assembly /datadisks/disk1/work/C93B0A7C/p/build/MonoTargetsTasks/MonoTargetsTasks.dll. Could not load file or assembly 'System.Runtime, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. The system cannot find the file specified. [/datadisks/disk1/work/C93B0A7C/w/BB8709BC/e/publish/ProxyProjectForAOTOnHelix.proj]
/datadisks/disk1/work/C93B0A7C/p/build/wasm/WasmApp.targets(247,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. [/datadisks/disk1/work/C93B0A7C/w/BB8709BC/e/publish/ProxyProjectForAOTOnHelix.proj]

@dotnet-maestro dotnet-maestro bot requested a review from marek-safar as a code owner April 4, 2022 02:53
@akoeplinger
Copy link
Member

akoeplinger commented Apr 4, 2022 •
edited
Loading

One question I had is why are these not using NetCoreAppToolCurrent/TargetFrameworkForNETCoreTasks and instead using a props local _TargetFrameworkForNETCoreTasks. Also, are there any objections to moving those props from src\tasks\Directory.Build.props to Directory.Build.props just to have them grouped and make SDK upgrades like this easier?

Yeah I think the only reason to having this duplicate was because they were in src\tasks\Directory.Build.props which wasn't imported by src\mono. I'd be in favor of moving these to the root Directory.Build.props.

EDIT: hmm actually these .props/.targets might be used outside of the dotnet/runtime repo (I think in BenchmarkDotNet) which is why they couldn't use the global properties. @naricc @radical is that correct?

@radical
Copy link
Member

radical commented Apr 4, 2022

EDIT: hmm actually these .props/.targets might be used outside of the dotnet/runtime repo (I think in BenchmarkDotNet) which is why they couldn't use the global properties. @naricc @radical is that correct?

Yeah. This file gets used outside the repo, with just the artifacts directory.

agocke and others added 2 commits April 4, 2022 16:15
@agocke
Update AssemblyStripper.csproj
4f78ef5
@radical
Fix build for net7.0
f11f9a4 
Fails with:
```
src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs(27,35): error CS0108: 'IpcSocket.AcceptAsync(CancellationToken)' hides inherited member 'Socket.AcceptAsync(CancellationToken)'. Use the new keyword if hiding was intended. [/__w/1/s/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj]
```
@radical
Copy link
Member

radical commented Apr 5, 2022

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@radical
sendhelixhelp.proj: Ensure that DotNetCliVersion gets overridden, as
848c39b 
.. intended. This seems to have been broken by the condition being
removed in
dotnet/arcade@cfdac35
from the `DotNetCliVersion` property, causing the value to always
overridden again to `6.0.100`.

And this breaks wasm aot/eat tests on helix:
```
/datadisks/disk1/work/A4EE08D9/p/build/wasm/WasmApp.Native.targets(569,5): error MSB4062: The "MonoAOTCompiler" task could not be loaded from the assembly /datadisks/disk1/work/A4EE08D9/p/build/MonoAOTCompiler/MonoAOTCompiler.dll. Could not load file or assembly 'System.Runtime, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. The system cannot find the file specified. [/datadisks/disk1/work/A4EE08D9/w/B3AE0955/e/publish/ProxyProjectForAOTOnHelix.proj]
/datadisks/disk1/work/A4EE08D9/p/build/wasm/WasmApp.Native.targets(569,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.
```
@radical
Copy link
Member

radical commented Apr 5, 2022

I'm not sure why the condition was removed for DotNetcliVersion in dotnet/arcade@cfdac35 , but that breaks the wasm aot/eat jobs that run on helix. Example: https://helixre8s23ayyeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-67436-merge-a999643369c446a1b1/normal-System.Runtime.Tests/1/console.c3268c0d.log?sv=2019-07-07&se=2022-04-25T06%3A01%3A54Z&sr=c&sp=rl&sig=dUUsqLY7HGWXBcHIuMz%2FCFEUHVm0p0a0jMVRBlhuM2g%3D

@radical
Copy link
Member

radical commented Apr 5, 2022

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Apr 5, 2022
Closed
Closed
Closed
@lewing
Copy link
Member

lewing commented Apr 5, 2022

I see we're doing a lot of work here, but darc seems to be updating #67485

@radical
Copy link
Member

radical commented Apr 5, 2022

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@lewing lewing mentioned this pull request Apr 7, 2022
Merged
@hoyosjs
Copy link
Member

hoyosjs commented Apr 8, 2022

Closing to split dependencies: #67771 is the arcade one

@hoyosjs hoyosjs closed this Apr 8, 2022
@ViktorHofer ViktorHofer deleted the darc-main-e8f262cb-ba2a-48ad-af27-9f469127294b branch April 11, 2022 13:45
@ghost ghost locked as resolved and limited conversation to collaborators May 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@akoeplinger akoeplinger akoeplinger left review comments

@jkotas jkotas jkotas left review comments

@hoyosjs hoyosjs hoyosjs requested changes

@marek-safar marek-safar Awaiting requested review from marek-safar

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.
7 participants
@akoeplinger @hoyosjs @danmoseley @radical @lewing @jkotas @agocke