[dotnet-maestro]

This pull request updates the following dependencies

From https://github.com/dotnet/core-setup

• Build: 20190420.10
• Date Produced: 4/21/2019 3:54 AM
• Commit: 3907f75
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview5-27620-10

From https://github.com/dotnet/core-setup

• Build: 20190421.08
• Date Produced: 4/22/2019 4:00 AM
• Commit: 416ae9f
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview5-27621-08

From https://github.com/dotnet/core-setup

• Build: 20190423.02
• Date Produced: 4/23/2019 9:58 AM
• Commit: d2ed800
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27623-02

From https://github.com/dotnet/core-setup

• Build: 20190423.21
• Date Produced: 4/24/2019 6:31 AM
• Commit: b6b5243
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27623-21

From https://github.com/dotnet/core-setup

• Build: 20190425.02
• Date Produced: 4/25/2019 10:25 AM
• Commit: 0800367
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27625-02

From https://github.com/dotnet/core-setup

• Build: 20190426.01
• Date Produced: 4/26/2019 9:32 AM
• Commit: ae2b1b8
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27626-01

From https://github.com/dotnet/core-setup

• Build: 20190427.02
• Date Produced: 4/27/2019 10:16 AM
• Commit: dfdc7bc
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27627-02

From https://github.com/dotnet/core-setup

• Build: 20190428.03
• Date Produced: 4/28/2019 11:32 AM
• Commit: 3cae3df
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27628-03

From https://github.com/dotnet/core-setup

• Build: 20190428.14
• Date Produced: 4/29/2019 4:39 AM
• Commit: 3e539b7
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27628-14

From https://github.com/dotnet/core-setup

• Build: 20190429.07
• Date Produced: 4/29/2019 7:48 PM
• Commit: a3967b6
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27629-07

From https://github.com/dotnet/core-setup

• Build: 20190429.07
• Date Produced: 4/29/2019 7:48 PM
• Commit: a3967b6
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27629-07

From https://github.com/dotnet/core-setup

• Build: 20190502.01
• Date Produced: 5/2/2019 8:33 AM
• Commit: cc67037
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27702-01

From https://github.com/dotnet/core-setup

• Build: 20190503.02
• Date Produced: 5/3/2019 11:08 AM
• Commit: 45876af
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27703-02

From https://github.com/dotnet/core-setup

• Build: 20190503.17
• Date Produced: 5/4/2019 3:46 AM
• Commit: 9296c54
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27703-17

From https://github.com/dotnet/core-setup

• Build: 20190505.02
• Date Produced: 5/5/2019 10:55 AM
• Commit: 71ef9ee
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27705-02

From https://github.com/dotnet/core-setup

• Build: 20190506.03
• Date Produced: 5/6/2019 11:56 AM
• Commit: 66f7e1a
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27706-03

From https://github.com/dotnet/core-setup

• Build: 20190506.21
• Date Produced: 5/7/2019 8:30 AM
• Commit: 48eadb3
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27706-21

From https://github.com/dotnet/core-setup

• Build: 20190507.10
• Date Produced: 5/8/2019 4:03 AM
• Commit: 911b999
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27707-10

From https://github.com/dotnet/core-setup

• Build: 20190508.04
• Date Produced: 5/9/2019 4:02 AM
• Commit: 19ecb48
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27708-04

From https://github.com/dotnet/core-setup

• Build: 20190509.05
• Date Produced: 5/9/2019 8:40 PM
• Commit: a8478dd
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27709-05

From https://github.com/dotnet/core-setup

• Build: 20190514.15
• Date Produced: 5/15/2019 7:32 AM
• Commit: 73226d6
• Branch: refs/heads/master
• Updates:
  • Microsoft.NETCore.App -> 3.0.0-preview6-27714-15

[jkotas]

@dagood This seems to be failing because of dotnet/core-setup#6096 and related changes. Could you please take a look?

[dagood]

@jkotas I think this would actually be caused by dotnet/core-setup#5893: Microsoft.NETCore.App is now Microsoft.NETCore.App.Internal, but the SDK only knows about the old name. The new Microsoft.NETCore.App doesn't contain any refs or pull in any runtimes, which would cause the compilation errors I'm seeing in this CI.

(dotnet/core-setup#6096 actually brings us one step back to how things were, by renaming runtime.<rid>.Microsoft.NETCore.App.Internal to runtime.<rid>.Microsoft.NETCore.App. That wasn't enough to fix CoreCLR tests, though, apparently.)

---

The way I fixed this for Core-Setup tests was to include an explicit Microsoft.NETCore.App.Internal reference in all 3.0 test projects:
https://github.com/dotnet/core-setup/blob/df68c22252186540d31c8b869109580330fd6293/src/test/Assets/TestProjects/MNADeprecationWorkaround.props
(CoreCLR'd use MicrosoftNETCoreAppVersion instead of MNAVersion.)

There might be a better way. I'm not sure if there are other SDK features with the implicit reference you'd miss by using that method. CoreCLR tests are undoubtedly more complex than Core-Setup's.
/cc @dsplaisted

[dsplaisted]

@jkotas I think what you should do here is probably to update to a later version of the .NET Core SDK, which will implicitly reference the .Internal package, rather than modifying the test project you are creating.

[dagood]

I think what you should do here is probably to update to a later version of the .NET Core SDK, which will implicitly reference the .Internal package, rather than modifying the test project you are creating.

What version enables this? Source-build constraints mean we should use at most 3.0 Preview 5 in master.

[jkotas]

update to a later version of the .NET Core SDK, which will implicitly reference the .Internal package

We are not on 3.0 SDK yet. It is a project on its own that I expect will take a while to finish. @AaronRobinsonMSFT #24285 is working towards it.

We can wait for the SDK update for this, but I am not sure whether the stale version of NETCoreApp used by CoreCLR is going to bite us somewhere else.

cc @jeffschwMSFT @RussKeldorph

[dsplaisted]

We've made a bunch of changes to how projects are built in .NET Core 3.0. It's going to be increasingly difficult to get a project to build correctly using a previous version of the SDK.

In this case it looks like possibly you need to apply the same fix to Coreclr.TestWrapper.csproj, but it's hard to tell.

[AaronRobinsonMSFT]

@dsplaisted @dagood @jkotas I am very much out of my comfort zone here so can I get someone to elaborate a bit on the root issue. As @jkotas mentioned my PR is a small step toward 3.0 SDK support, but right now is only moving toward SDK support but still targeting 2.1. What is the issue here that relies on the semantics defined in 3.0?

[AaronRobinsonMSFT]

Spoke to @dsplaisted offline. I understand this issue now.

[wtgodbe]

@AaronRobinsonMSFT what do we need to do to get this in?

[AaronRobinsonMSFT]

We need to move over to SDK projects and adopt the 3.0 SDK. From my understanding this is blocked until that point. I am hitting a single test failure on Ubuntu CoreFX Checked and trying to figure out the issue. Until that happens step 0 - convert to SDK projects can't happen. Once that is done, someone can try moving to 3.0, which should be a relatively simple transition.

cc @RussKeldorph

[RussKeldorph]

We should not wait for @AaronRobinsonMSFT to finish #24285 to unblock this. We need to apply a workaround, such as suggested by @dagood or @dsplaisted, if we can't temporarily back out whatever change originally caused this in core-setup or other repo.

[RussKeldorph]

@josalem Can you see if you can figure this out?

[josalem]

I think I've got a workaround that works locally, but I want to test it against all platforms to make sure it unblocks things.

[dagood]

I recommend separating the version properties coming from different repos to avoid as many merge conflicts here. For example, core-setup has:

    <!-- corefx -->
    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview6.19256.13</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview6.19256.13</MicrosoftNETCorePlatformsPackageVersion>
    <MicrosoftNETCoreTargetsPackageVersion>2.0.0</MicrosoftNETCoreTargetsPackageVersion>
    <!-- standard -->
    <NETStandardLibraryPackageVersion>2.1.0-prerelease.19230.1</NETStandardLibraryPackageVersion>
    <!-- coreclr -->
    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6-27706-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>

(If adjacent lines changes, that's a merge conflict. Blank lines don't work because Maestro++ removes them.)

[josalem]

Is there a list of which dependencies belong to which repo so I can add the comments? I'd like to avoid these merge conflicts in the future since it is a pain...

[dagood]

That'd be eng/Version.Details.xml.

Definitely a pain. 😄 This may make auto-updates come through quicker, too.

[josalem]

The failures for ARM, ARM64, and OSX look to be related to dotnet/core-eng#6266

[josalem]

/azp run Test Pri0 Linux arm64_checked
/azp run Test Pri0 Linux arm_checked
/azp run Test Pri0 OSX x64_checked

[azure-pipelines]

No pipelines are associated with this pull request.

[RussKeldorph]

/azp list

[azure-pipelines]

CI/CD Pipelines for this repository:
coreclr-outerloop
coreclr-ci
dotnet-coreclr-nullablefeature

[josalem]

last failure looks related to: dotnet/core-eng#6295

[hoyosjs]

Conflict in the saved pipeline artifacts. Closing and reopening.

[josalem]

Something seems wonky about the Windows legs of CI. I can't seem to find the current run of CI in the checks details or on Az Pipelines. The Linux arm pri0 tests are passing now according to Az Pipelines now though.

[AaronRobinsonMSFT]

Took the latest version when merging the file.