Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[master] Update dependencies from dotnet/arcade - #37487

Closed
dotnet-maestro[bot] wants to merge 2 commits into
masterfrom
darc-master-b4209caf-0dc3-4dcb-b1bc-491d29bb0f4f
Closed

[master] Update dependencies from dotnet/arcade#37487
dotnet-maestro[bot] wants to merge 2 commits into
masterfrom
darc-master-b4209caf-0dc3-4dcb-b1bc-491d29bb0f4f

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor

This pull request updates the following dependencies

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

  • Build: 20190506.12
  • Date Produced: 5/7/2019 5:12 AM
  • Commit: c31fac9f6899094226cb5cd77c85b8f60ecafa3d
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.DotNet.XUnitExtensions -> 2.4.0-beta.19256.12
    • Microsoft.DotNet.XUnitConsoleRunner -> 2.5.1-beta.19256.12
    • Microsoft.DotNet.VersionTools.Tasks -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.ApiCompat -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.Build.Tasks.Configuration -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.Build.Tasks.Feed -> 2.2.0-beta.19256.12
    • Microsoft.DotNet.Build.Tasks.Packaging -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.CodeAnalysis -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.CoreFxTesting -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.GenAPI -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.GenFacades -> 1.0.0-beta.19256.12
    • Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19256.12
    • Microsoft.DotNet.RemoteExecutor -> 1.0.0-beta.19256.12

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

  • Build: 20190507.3
  • Date Produced: 5/7/2019 5:44 PM
  • Commit: b1d8ba9936d10e8d287474e28278477d2126742a
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.DotNet.XUnitExtensions -> 2.4.0-beta.19257.3
    • Microsoft.DotNet.XUnitConsoleRunner -> 2.5.1-beta.19257.3
    • Microsoft.DotNet.VersionTools.Tasks -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.ApiCompat -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.Build.Tasks.Configuration -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.Build.Tasks.Feed -> 2.2.0-beta.19257.3
    • Microsoft.DotNet.Build.Tasks.Packaging -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.CodeAnalysis -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.CoreFxTesting -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.GenAPI -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.GenFacades -> 1.0.0-beta.19257.3
    • Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19257.3
    • Microsoft.DotNet.RemoteExecutor -> 1.0.0-beta.19257.3

dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20190…
e3afc16 
…506.12

- Microsoft.DotNet.XUnitExtensions - 2.4.0-beta.19256.12
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19256.12
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19256.12
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19256.12
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19256.12
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19256.12
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19256.12
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19256.12
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19256.12
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19256.12
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19256.12
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19256.12
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19256.12
@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@joperezr

joperezr commented May 7, 2019

Copy link
Copy Markdown
Member

FYI: @ericstj is somebody looking into fixing this ingestion? If not I can take a peek. Errors seem to be related to recent ApiCompat changes:
D:\a\1\s\.packages\microsoft.dotnet.apicompat\1.0.0-beta.19256.12\build\Microsoft.DotNet.ApiCompat.targets(49,5): error : ResolvedMatchingContract item must be specified to run API compat. [D:\a\1\s\src\System.Runtime\ref\System.Runtime.csproj]

@joperezr

joperezr commented May 7, 2019

Copy link
Copy Markdown
Member

Just chatted with @ericstj, looks like he is fixing this with his PR #37375 so this PR may either be closed or will simple not get merged.

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@ericstj ericstj added the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label May 7, 2019
@ericstj

ericstj commented May 7, 2019

Copy link
Copy Markdown
Member

Yes, we'll close this once my PR is merged.

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@wtgodbe

wtgodbe commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

This is going to get the same warnings as dotnet/standard#1173 once we fix the APICompat error:

F:\workspace_work\1\s.dotnet\sdk\3.0.100-preview3-010431\Microsoft.Common.CurrentVersion.targets(45,3): warning MSB4011: "F:\workspace_work\1\s.packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.19256.12\tools\BeforeCommonTargets.targets" cannot be imported again. It was already imported at "F:\workspace_work\1\s.packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.19256.12\tools\Imports.targets (13,3)".

This is because of https://github.com/dotnet/arcade/blob/8de2bbb925610428f126afa213c02344b4fc0ee0/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props#L7. SDK.targets does the following things:

In case the above was confusing, the short version is: We explicitly import BeforeCommonTargets.targets, as long as nobody has imported it before us. Then later, Microsoft.Common.CurrentVersion.targets imports that same file again, without checking if anybody has already imported it.

@tmat looks like this bug was introduced with dotnet/arcade#2615, what was the motivation for overwriting CustomBeforeMicrosoftCommonTargets ?

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@tmat

tmat commented May 7, 2019

Copy link
Copy Markdown
Member

what was the motivation for overwriting CustomBeforeMicrosoftCommonTargets ?

@wtgodbe https://github.com/dotnet/arcade/pull/2615/files#diff-231712037b5792fe3736179b37666c27R8

@tmat

tmat commented May 7, 2019

Copy link
Copy Markdown
Member

Imports Microsoft.Common.CurrentVersion.targets

The last step should happen before the Arcade SDK targets are executed. At that point we already know whether we need to import or not.

@wtgodbe

wtgodbe commented May 7, 2019

Copy link
Copy Markdown
Member

@tmat we are still broken here though - I see in dotnet/arcade@e5abcae you added the explicit import of BeforeCommonTargets.targets, for projects that don't import Microsoft.Common.CurrentVersion.targets. However, projects that do import Microsoft.Common.CurrentVersion.targets will always import BeforeCommonTargets.targets twice, since Microsoft.Common.CurrentVersion.targets doesn't check if CustomBeforeMicrosoftCommonTargets was already imported

@tmat

tmat commented May 7, 2019

Copy link
Copy Markdown
Member

Do you have a binlog with the failure?

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@wtgodbe

wtgodbe commented May 7, 2019

Copy link
Copy Markdown
Member

@tmat I've just sent you the files via Teams

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Linux arm_Release), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

@wtgodbe

wtgodbe commented May 7, 2019

Copy link
Copy Markdown
Member

Looks like the error I described above is actually specific to Standard - I'll work on a fix over there. We should be fine in CoreFx

@dotnet-maestro

dotnet-maestro Bot commented May 7, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Auto-Merge Status

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

  • ❌ All Checks Successful Unsuccessful checks: corefx-ci, corefx-ci (Linux musl_arm64_Release), corefx-ci (Linux arm_Release), corefx-ci (MacOS x64_Debug), corefx-ci (Windows UWP_NETNative_x86_Release), corefx-ci (Linux musl_x64_Release), corefx-ci (Windows UWP_CoreCLR_x64_Debug), corefx-ci (Linux arm64_Release), corefx-ci (Windows NETFX_x86_Release), corefx-ci (Linux x64_Release), corefx-ci (Windows x86_Release), corefx-ci (Windows x64_Debug), corefx-ci (Packaging All Configurations x64_Debug)

dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20190…
81c86d9 
…507.3

- Microsoft.DotNet.XUnitExtensions - 2.4.0-beta.19257.3
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19257.3
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19257.3
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19257.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.3
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19257.3
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19257.3
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19257.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19257.3
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19257.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19257.3
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19257.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19257.3
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19257.3
@ericstj

ericstj commented May 8, 2019

Copy link
Copy Markdown
Member

Conflicts

@ericstj ericstj closed this May 8, 2019
@stephentoub
stephentoub deleted the darc-master-b4209caf-0dc3-4dcb-b1bc-491d29bb0f4f branch May 9, 2019 11:19
@karelz karelz added this to the 3.0 milestone May 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

* NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons)

Projects

None yet

Milestone

3.0

Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr @ericstj @wtgodbe @tmat @karelz