[master] Update dependencies from dotnet/core-setup#24149
Conversation
|
@dagood This seems to be failing because of dotnet/core-setup#6096 and related changes. Could you please take a look? |
|
@jkotas I think this would actually be caused by dotnet/core-setup#5893: (dotnet/core-setup#6096 actually brings us one step back to how things were, by renaming The way I fixed this for Core-Setup tests was to include an explicit 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. |
…0190429.07 - Microsoft.NETCore.App - 3.0.0-preview6-27629-07
57f950d to
7e0cf1d
Compare
|
@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. |
What version enables this? Source-build constraints mean we should use at most 3.0 Preview 5 in |
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. |
|
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. |
|
@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? |
|
Spoke to @dsplaisted offline. I understand this issue now. |
…0190502.01 - Microsoft.NETCore.App - 3.0.0-preview6-27702-01
…0190503.02 - Microsoft.NETCore.App - 3.0.0-preview6-27703-02
|
@AaronRobinsonMSFT what do we need to do to get this in? |
|
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. |
|
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. |
…0190503.17 - Microsoft.NETCore.App - 3.0.0-preview6-27703-17
…0190505.02 - Microsoft.NETCore.App - 3.0.0-preview6-27705-02
…0190506.03 - Microsoft.NETCore.App - 3.0.0-preview6-27706-03
…0190506.21 - Microsoft.NETCore.App - 3.0.0-preview6-27706-21
|
@josalem Can you see if you can figure this out? |
…0190507.10 - Microsoft.NETCore.App - 3.0.0-preview6-27707-10
|
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. |
…0190508.04 - Microsoft.NETCore.App - 3.0.0-preview6-27708-04
…thub.com:dotnet/coreclr into darc-master-895adbc9-3fdf-4108-bc0a-6d780ac1622d
eng/Versions.props
Outdated
| <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19229.1</MicrosoftPrivateCoreFxNETCoreAppVersion> | ||
| <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19229.1</MicrosoftNETCorePlatformsVersion> | ||
| <MicrosoftNETCoreAppVersion>3.0.0-preview5-27620-01</MicrosoftNETCoreAppVersion> | ||
| <MicrosoftNETCoreAppVersion>3.0.0-preview6-27708-04</MicrosoftNETCoreAppVersion> |
There was a problem hiding this comment.
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.)
There was a problem hiding this comment.
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...
There was a problem hiding this comment.
That'd be eng/Version.Details.xml.
Definitely a pain. 😄 This may make auto-updates come through quicker, too.
|
The failures for ARM, ARM64, and OSX look to be related to dotnet/core-eng#6266 |
|
/azp run Test Pri0 Linux arm64_checked |
|
No pipelines are associated with this pull request. |
…0190509.05 - Microsoft.NETCore.App - 3.0.0-preview6-27709-05
…locked maestro PRs
|
/azp list |
|
CI/CD Pipelines for this repository: |
|
last failure looks related to: dotnet/core-eng#6295 |
|
Conflict in the saved pipeline artifacts. Closing and reopening. |
|
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. |
…0190514.15 - Microsoft.NETCore.App - 3.0.0-preview6-27714-15
|
Took the latest version when merging the file. |
* Update dependencies from https://github.com/dotnet/core-setup build 20190429.07 - Microsoft.NETCore.App - 3.0.0-preview6-27629-07 * Workaround for dotnet/core-setup#5893 * Update dependencies from https://github.com/dotnet/core-setup build 20190502.01 - Microsoft.NETCore.App - 3.0.0-preview6-27702-01 * Update dependencies from https://github.com/dotnet/core-setup build 20190503.02 - Microsoft.NETCore.App - 3.0.0-preview6-27703-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190503.17 - Microsoft.NETCore.App - 3.0.0-preview6-27703-17 * Update dependencies from https://github.com/dotnet/core-setup build 20190505.02 - Microsoft.NETCore.App - 3.0.0-preview6-27705-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190506.03 - Microsoft.NETCore.App - 3.0.0-preview6-27706-03 * Update dependencies from https://github.com/dotnet/core-setup build 20190506.21 - Microsoft.NETCore.App - 3.0.0-preview6-27706-21 * Update dependencies from https://github.com/dotnet/core-setup build 20190507.10 - Microsoft.NETCore.App - 3.0.0-preview6-27707-10 * Workaround for Microsoft.NetCore.App version in Coreclr.TestWrapper.csproj to unblock dotnet#24149 * Update dependencies from https://github.com/dotnet/core-setup build 20190508.04 - Microsoft.NETCore.App - 3.0.0-preview6-27708-04 * Add comment attaching specific pull request to workaround * Update dependencies from https://github.com/dotnet/core-setup build 20190509.05 - Microsoft.NETCore.App - 3.0.0-preview6-27709-05 * Add comments in versions.props to prevent merge conflicts in future blocked maestro PRs * Update dependencies from https://github.com/dotnet/core-setup build 20190514.15 - Microsoft.NETCore.App - 3.0.0-preview6-27714-15
…4149) * Update dependencies from https://github.com/dotnet/core-setup build 20190429.07 - Microsoft.NETCore.App - 3.0.0-preview6-27629-07 * Workaround for dotnet/core-setup#5893 * Update dependencies from https://github.com/dotnet/core-setup build 20190502.01 - Microsoft.NETCore.App - 3.0.0-preview6-27702-01 * Update dependencies from https://github.com/dotnet/core-setup build 20190503.02 - Microsoft.NETCore.App - 3.0.0-preview6-27703-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190503.17 - Microsoft.NETCore.App - 3.0.0-preview6-27703-17 * Update dependencies from https://github.com/dotnet/core-setup build 20190505.02 - Microsoft.NETCore.App - 3.0.0-preview6-27705-02 * Update dependencies from https://github.com/dotnet/core-setup build 20190506.03 - Microsoft.NETCore.App - 3.0.0-preview6-27706-03 * Update dependencies from https://github.com/dotnet/core-setup build 20190506.21 - Microsoft.NETCore.App - 3.0.0-preview6-27706-21 * Update dependencies from https://github.com/dotnet/core-setup build 20190507.10 - Microsoft.NETCore.App - 3.0.0-preview6-27707-10 * Workaround for Microsoft.NetCore.App version in Coreclr.TestWrapper.csproj to unblock dotnet/coreclr#24149 * Update dependencies from https://github.com/dotnet/core-setup build 20190508.04 - Microsoft.NETCore.App - 3.0.0-preview6-27708-04 * Add comment attaching specific pull request to workaround * Update dependencies from https://github.com/dotnet/core-setup build 20190509.05 - Microsoft.NETCore.App - 3.0.0-preview6-27709-05 * Add comments in versions.props to prevent merge conflicts in future blocked maestro PRs * Update dependencies from https://github.com/dotnet/core-setup build 20190514.15 - Microsoft.NETCore.App - 3.0.0-preview6-27714-15 Commit migrated from dotnet/coreclr@e03969f
This pull request updates the following dependencies
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup
From https://github.com/dotnet/core-setup