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

[master] Update dependencies from dotnet/arcade #21091

Merged

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 31, 2020

This pull request updates the following dependencies

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

  • Subscription: 4ebe67d7-d53d-4b27-d461-08d76e1d3434
  • Build: 20200528.4
  • Date Produced: 5/28/2020 4:10 PM
  • Commit: 96c65ad967d2abbbd8e770ba752a6b64255ec669
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20261.9 to 5.0.0-beta.20278.4
    • Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20261.9 to 5.0.0-beta.20278.4

…528.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4
@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner May 31, 2020 15:51
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 31, 2020

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: efcore-ci, efcore-ci (Build Helix)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@BrennanConroy
Copy link
Member

BrennanConroy commented Jun 1, 2020

@smitpatel Is EF relying on an SDK/Runtime version just being on the Helix machines? I don't see any logic to install specific versions.

Arcade is now updating SDK versions in global.json (don't think it did this before).

Helix error:

It was not possible to find any compatible framework version
The framework 'Microsoft.NETCore.App', version '5.0.0-preview.6.20264.1' was not found.
  - The following frameworks were found:
      5.0.0-preview.5.20230.9 at [C:\h\w\B56A0A09\p\dotnet\shared\Microsoft.NETCore.App]

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 1, 2020

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: efcore-ci, efcore-ci (Build Helix)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@smitpatel
Copy link
Member

This line needs to be updated. https://github.com/dotnet/efcore/blob/master/eng/helix.proj#L11

@BrennanConroy
Copy link
Member

Awesome, thanks I'll update

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 1, 2020

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Waiting on checks: efcore-ci, efcore-ci (Build Helix)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@dougbu
Copy link
Member

dougbu commented Jun 1, 2020

@BrennanConroy FYI

don't think it did this before

Yes, it's done this before and we've had to make the same change in the past. @dotnet/efcore why are you fine with Helix tests breaking on every SDK update (whether Arcade-inspired or not)? Long-term fix would be something like what @HaoK did in dotnet/aspnetcore to get the right SDK version to the Helix agents.

@HaoK I've seen that code but can't point to it at the moment. Can you lead the way?

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 1, 2020

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Waiting on checks: efcore-ci, efcore-ci (Build Helix)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@HaoK
Copy link
Member

HaoK commented Jun 1, 2020

We do things differently in aspnet, EFCore is using the built in xunit support so they are tied to the sdk version, we use $(NETCoreSdkVersion) in our builds. But our test runner manually downloads specific sdk and runtime builds. Once helix ingests some of fowler's improvements, we will probably switch to relying on the sdk support built into helix as well, and then we'd just set DotNetCliVersion to $(NETCoreSdkVersion) on the aspnetcore builds

@dotnet-maestro dotnet-maestro bot merged commit 04b923a into master Jun 1, 2020
@dotnet-maestro dotnet-maestro bot deleted the darc-master-77e33131-42b8-40bb-8921-a7ef5d8b825d branch June 1, 2020 21:57
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jun 1, 2020

Auto-Merge Status

This pull request will be merged because the following merge policies have succeeded.

  • ✔️ Standard Merge Policies Succeeded - Successful checks: efcore-ci, efcore-ci (Build Linux), efcore-ci (Build Helix), efcore-ci (Build Windows), efcore-ci (Build macOS), build
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@smitpatel
Copy link
Member

@dougbu - We only update SDK once a preview version (that would be once a month only), hence we don't think it is too much of burden to update both of the places together. We are not opposed to having SDK take value directly in helix if it is there in some variable. Due to low cost to us, we haven't prioritized doing that work. If you want to contribute a PR, we would happy to take it.

lukas-lansky pushed a commit that referenced this pull request Jun 2, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20200528.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4

* Update dotnet on helix

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>
dotnet-maestro bot added a commit that referenced this pull request Jun 3, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20200530.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20280.1

* [master] Update dependencies from dotnet/arcade (#21091)

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4

* Update dotnet on helix

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>
wtgodbe pushed a commit that referenced this pull request Jun 8, 2020
* [release/5.0-preview6] Update dependencies from dotnet/arcade (#21111)

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20280.1

* [master] Update dependencies from dotnet/arcade (#21091)

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4

* Update dotnet on helix

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>

* Return ValueTask in loggers and interceptors (#21152) (#21158)

Closes #21109

(cherry picked from commit 9f316e5)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>
Co-authored-by: Shay Rojansky <roji@roji.org>
wtgodbe pushed a commit that referenced this pull request Jun 9, 2020
* [release/5.0-preview6] Update dependencies from dotnet/arcade (#21111)

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20280.1

* [master] Update dependencies from dotnet/arcade (#21091)

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4

* Update dotnet on helix

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>

* Return ValueTask in loggers and interceptors (#21152) (#21158)

Closes #21109

(cherry picked from commit 9f316e5)

* Add ConfigureAwait(false) (#21110) (#21185)

Set up Microsoft.CodeAnalysis.FxCopAnalyzers with only the
ConfigureAwait rule enabled.

Closes #10164

(cherry picked from commit e1c9a3a)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Brennan <brecon@microsoft.com>
Co-authored-by: Shay Rojansky <roji@roji.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants