Skip to content
This repository was archived by the owner on Sep 13, 2022. It is now read-only.

Update BuildTools to 2.1.0-preview2-02621-01, fix up build#690

Merged
dagood merged 3 commits into
dotnet:release/2.0.0from
dagood:update-buildtools/release/2.0.0
Mar 21, 2018
Merged

Update BuildTools to 2.1.0-preview2-02621-01, fix up build#690
dagood merged 3 commits into
dotnet:release/2.0.0from
dagood:update-buildtools/release/2.0.0

Conversation

@dagood
Copy link
Copy Markdown
Member

@dagood dagood commented Mar 21, 2018

This was driven by attempting to build on Fedora 26, but I also successfully built on Windows.

Doing this for dotnet/source-build#371 (comment)

@dagood dagood requested review from eerhardt and weshaggard March 21, 2018 17:57
@weshaggard
Copy link
Copy Markdown
Member

For the RunMatchingRefApiCompat issue you should just need f71d878. Porting that should make the branches more consistent.

@dagood
Copy link
Copy Markdown
Member Author

dagood commented Mar 21, 2018

Ah, I didn't think to check the master branch here. I'll port that instead, thanks.

@dagood dagood force-pushed the update-buildtools/release/2.0.0 branch from ab4e5d3 to b5a58fc Compare March 21, 2018 19:28
@dagood
Copy link
Copy Markdown
Member Author

dagood commented Mar 21, 2018

CI's green, and it works in the context of a known-good RHEL source-build on my dev machine. Ok to merge @weshaggard?

@weshaggard
Copy link
Copy Markdown
Member

@dagood are the other changes inline with what is in master? If so go ahead and merge if not I would like to make sure they match master as well.

joperezr and others added 3 commits March 21, 2018 16:19
(cherry picked from commit 76170be)

# Conflicts:
#	BuildToolsVersion.txt
#	dependencies.props
It is expected that netstandard ref doesn't expose all
APIs we use to generate the facade for.

(cherry picked from commit f71d878)
@dagood
Copy link
Copy Markdown
Member Author

dagood commented Mar 21, 2018

There were newline differences at the end of the version txt files, so I did another cherry-pick and my only change is using the newer BuildTools. (Also nice to have the cherry-pick traceability.)

I had conflicts cherry-picking the MSBuild change: there were divergent BuildTools updates (resolved in favor of master), and release/2.0.0 doesn't have a dependencies.props file at all so I didn't take that change.

@dagood dagood force-pushed the update-buildtools/release/2.0.0 branch from b5a58fc to 0bff137 Compare March 21, 2018 21:28
@dagood dagood merged commit bb2c2cb into dotnet:release/2.0.0 Mar 21, 2018
@dagood dagood deleted the update-buildtools/release/2.0.0 branch March 21, 2018 22:06
@ericstj
Copy link
Copy Markdown
Member

ericstj commented Apr 5, 2018

Why didn't you bring over a buildtools version from the release/2.0.0 branch? This creates unnecessary risk for servicing releases.

@weshaggard
Copy link
Copy Markdown
Member

The primary reason is we use this release/2.0.0 branch in source-build and so it needs to work with the latest BuildTools in order to buildable there.

@dagood
Copy link
Copy Markdown
Member Author

dagood commented Apr 5, 2018

The alternative I had in mind at the time was to make a release/2.1 branch here. I don't think it's feasible to port everything we need to BuildTools release/2.0.0 since all repos would need to uptake it (and there's a decent number of breaks).

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.

4 participants