Skip to content

[release/5.0] Update dependencies from dotnet/arcade #43185

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
Merged
ViktorHofer merged 5 commits into from
Oct 10, 2020
Merged

[release/5.0] Update dependencies from dotnet/arcade #43185

ViktorHofer merged 5 commits into from
Oct 10, 2020

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 8, 2020

This pull request updates the following dependencies

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

  • Subscription: 940d3898-e987-479e-d5c6-08d86afcfba8
  • Build: 20201006.7
  • Date Produced: 10/6/2020 10:54 PM
  • Commit: ee39cd1573dbb8011f343e1037af51d4fc00a747
  • Branch: refs/heads/master

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20201…
5de4f3f 
…006.7

Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat
 From Version 5.0.0-beta.20474.4 -> To Version 5.0.0-beta.20506.7
@ghost
Copy link

ghost commented Oct 8, 2020

Tagging subscribers to this area: @safern, @ViktorHofer
See info in area-owners.md if you want to be subscribed.

@mmitche
Copy link
Member

mmitche commented Oct 9, 2020

@ViktorHofer Also errors here.

@Anipik
Copy link
Contributor

Anipik commented Oct 9, 2020

cc @ViktorHofer

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 9, 2020

@jkotas are these the same compiler issues that we hit before in master because of the compiler update?

@jkotas
Copy link
Member

jkotas commented Oct 9, 2020

There is some overlap with #43056 but I see unique additional warnings as well. For example, CultureData.Nls.cs or CalendarData.Icu.cs were not touched by #43056.

@jkotas
Copy link
Member

jkotas commented Oct 9, 2020

Unless you beat me to it, I can take a look later today after I am done with meetings. I would start with cherry picking #43056 (without the compiler pin).

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 9, 2020

Just gave the cherry-pick a try and am seeing couple of merge conflicts in:

        both modified:   src/coreclr/src/tools/Common/JitInterface/CorInfoBase.cs
        both modified:   src/coreclr/src/tools/Common/JitInterface/JitConfigProvider.cs
        both modified:   src/coreclr/src/tools/Common/JitInterface/ThunkGenerator/Program.cs

As those are runtime specific files, I would let you solve them if that's ok? Thanks

AaronRobinsonMSFT and others added 2 commits October 9, 2020 15:45
@AaronRobinsonMSFT @jkotas
Roslyn update response (#43056)
b54e566 
* Update function pointer syntax usage to official.

* Fix warnings with new Roslyn

Co-authored-by: Jan Kotas <[email protected]>
@jcouv @jkotas
Adjust for roslyn change on ref parameters and NotNullIfNotNull (#42707)
9cfb20d 
* Adjust for roslyn change on ref parameters

* Adjust for roslyn change on NotNullIfNotNull
@jkotas
Copy link
Member

jkotas commented Oct 9, 2020

I have cherry picked the commits with build break fixed. The next failure is:

C:\h\w\B41809AC\p\dotnet-cli\sdk\5.0.100-rc.1.20454.5\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.TargetFrameworkInference.targets(146,5): error NETSDK1045: The current .NET SDK does not support targeting .NET Core 6.0. Either target .NET Core 5.0 or lower, or use a version of the .NET SDK that supports .NET Core 6.0. [C:\h\w\B41809AC\w\BDCD09FF\u\net6.0\project.csproj]

It looks like .NET 6 leaked into .NET 5 somehow. I am not sure how to fix that. @ViktorHofer Could you please look into that?

@safern
Copy link
Member

safern commented Oct 9, 2020

Hmm that looks interesting...

@safern
Copy link
Member

safern commented Oct 10, 2020

Ah I see why this is: https://github.com/dotnet/arcade/pull/6269/files

This is because we added net6.0 package testing to arcade but since we added it before we branched off arcade for 5.0 it is including that change here.

We can workaround this. I will put up a workaround for this.

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 10, 2020

Submitted a fix to Arcade to remove the net6.0 packaging validation change that shouldn't be in their release/5.0 branch: dotnet/arcade#6383

@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 10, 2020

The Json failure is: #35927, the FileSystemWatch one is: #504.

@ViktorHofer ViktorHofer merged commit db79f63 into release/5.0 Oct 10, 2020
@ViktorHofer ViktorHofer deleted the darc-release/5.0-ccb38fa4-ece1-45cf-88c6-dd548a69c1a7 branch October 10, 2020 08:53
@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 10, 2020

Thanks @jkotas and @safern

@runfoapp runfoapp bot mentioned this pull request Oct 12, 2020
Open
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
@danmoseley danmoseley added area-codeflow for labeling automated codeflow and removed area-Infrastructure-libraries labels Jul 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ViktorHofer ViktorHofer ViktorHofer 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.

10 participants

@mmitche @Anipik @ViktorHofer @jkotas @safern @danmoseley @Dotnet-GitSync-Bot @AaronRobinsonMSFT @jcouv