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

Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-25227-01, preview2-25227-01, beta-25227-00, beta-25227-00, preview2-25227-01, respectively (release/2.0.0) - #19024

Merged
weshaggard merged 1 commit into
dotnet:release/2.0.0from
dotnet-bot:release/2.0.0-UpdateDependencies
Apr 27, 2017

Conversation

@dotnet-bot

@dotnet-bot dotnet-bot commented Apr 27, 2017

Copy link
Copy Markdown

No description provided.

@dotnet-bot dotnet-bot changed the title Update CoreClr, CoreFx to preview2-25226-06, preview2-25226-02, respectively (release/2.0.0) Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC to preview2-25226-06, preview2-25227-01, beta-25227-00, beta-25227-00, respectively (release/2.0.0) Apr 27, 2017
@dotnet-bot
dotnet-bot force-pushed the release/2.0.0-UpdateDependencies branch 3 times, most recently from b39cac2 to 84c0611 Compare April 27, 2017 07:53
@stephentoub

Copy link
Copy Markdown
Member

@brianrob, @weshaggard, this error is back here, too:

D:\j\workspace\AllConfigurat---2782440f\Tools\partialfacades.task.targets(70,5): error : Errors were encountered when generating facade(s). [D:\j\workspace\AllConfigurat---2782440f\src\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj]

@dotnet-bot dotnet-bot changed the title Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC to preview2-25226-06, preview2-25227-01, beta-25227-00, beta-25227-00, respectively (release/2.0.0) Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-25227-01, preview2-25227-01, beta-25227-00, beta-25227-00, preview2-25227-01, respectively (release/2.0.0) Apr 27, 2017
@dotnet-bot
dotnet-bot force-pushed the release/2.0.0-UpdateDependencies branch 2 times, most recently from 10afed2 to 1e9ce26 Compare April 27, 2017 13:18
Comment thread dependencies.props Outdated
<ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef>
<ProjectNTfsCurrentRef>ff616742d18be3af7e9da9327d51502b79de859d</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>ff616742d18be3af7e9da9327d51502b79de859d</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>a84d35ed9b6b6da8749cf90a2c107f4adfc73a2b</ProjectNTfsCurrentRef>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dagood any ideas why this is updating the ProjectN refs when they aren't part of the subscription triggers https://github.com/dotnet/versions/blob/master/Maestro/subscriptions.json#L282?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to update the DependencyBranch property below in the release branch?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The subscription triggers only trigger the update--they aren't passed into the auto-upgrade build at all. (All updates need to happen during any trigger so that the commit that's generated is fresh from GitHub's HEAD yet contains all updates.) To disable updating you need to get rid of the RemoteDependencyBuildInfo.

@dagood dagood Apr 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think updating DependencyBranch without removing ProjectN's RemoteDependencyBuildInfo would actually cause build errors, since ProjectN doesn't have a release/2.0.0 build-info.

EDIT: But in general, yes, DependencyBranch should be updated so CoreFX gets updates from CoreCLR/Standard/CoreFX release/2.0.0 rather than master.

…preview2-25227-01, preview2-25227-01, beta-25227-00, beta-25227-00, preview2-25227-01, respectively
@weshaggard
weshaggard force-pushed the release/2.0.0-UpdateDependencies branch from 1e9ce26 to a3771c9 Compare April 27, 2017 16:23
@weshaggard

Copy link
Copy Markdown
Member

@dagood @ravimeda could you guys please take a look at my changes in dependencies.props?

Comment thread dependencies.props
<!--
<XmlUpdateStep Include="External">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ExternalExpectedPrerelease</ElementName>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch that these need to be commented out. I think they could be conditioned on whether the RemoteDependencyBuildInfo exists, but that seems more complicated than it's worth.

@brianrob

Copy link
Copy Markdown
Member

@weshaggard, I originally suspected that this was because I removed EventCounter.cs from System.Private.CoreLib and it took time to get sunk to the the UAP builds. Is this not the case?

@weshaggard

Copy link
Copy Markdown
Member

@brianrob that is what I thought as well but this is the release/2.0.0 branch which shouldn't be getting updates for those packages right now. So the fix is to stop those from updating. You might hit that issue in master though if you have changed it recently.

@weshaggard
weshaggard merged commit 47f331e into dotnet:release/2.0.0 Apr 27, 2017
@brianrob

Copy link
Copy Markdown
Member

Got it. I missed that this was into release.

@karelz karelz modified the milestone: 2.0.0 Apr 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants