Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mono/osx build and tests #758

Merged
merged 3 commits into from
Jul 8, 2016
Merged

Conversation

radical
Copy link
Member

@radical radical commented Jul 3, 2016

No description provided.

Ankit Jain added 2 commits July 2, 2016 22:49
Commit 8f27bba broke the mono build as
a result of changed field/property names, which were being compiled only
for `FEATURE_WIN32_REGISTRY`.
... generated app.config file. This caused test failures with mono/osx
as it was running with `15.0` but the app.config had entries for `14.1` .
@@ -581,12 +581,12 @@ public void ExtensionPathsTest_Basic1()
#if XPLAT
Copy link
Member

Choose a reason for hiding this comment

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

(discussion, doesn't need to be done now)

Should we remove this condition? It seems . . . imprecise, and I vaguely recall that it was mostly to reduce code churn caused by porting a feature that originated in xplat to master.

(I'm working on it!)

Copy link
Member

Choose a reason for hiding this comment

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

Oh, you had to add the XPLAT define in this review. Then I think it should be removed entirely. If I'm reading the code right that shouldn't require any code change--it was just there to wall off the platform-detection methods that don't exist in master yet.

@rainersigwald
Copy link
Member

Thanks! Looks good once we just get rid of the XPLATdefine..

... constant that is unnecessary now. "it was just there to wall off the
platform-detection methods that don't exist in master yet." - Rainer
@radical
Copy link
Member Author

radical commented Jul 7, 2016

Removed XPLAT completely.

@rainersigwald
Copy link
Member

Awesome. Looks good to me. @Microsoft/msbuild-maintainers ?

@cdmihai
Copy link
Contributor

cdmihai commented Jul 8, 2016

LGTM

@rainersigwald rainersigwald merged commit 0242a62 into dotnet:xplat Jul 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants