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

replace project-level Common.props imports with Directory.Build.props #852

Merged
merged 3 commits into from
Feb 28, 2017

Conversation

jonsequitur
Copy link
Contributor

This removes the Common.props imports from the projects under /test and /src and replaces them with Directory.Build.props.

This addresses #802.

@jonsequitur
Copy link
Contributor Author

I'm still working on getting dotnet test to work. Meanwhile, I wanted to see the CI results.

@@ -0,0 +1,5 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
Copy link
Member

@rainersigwald rainersigwald Feb 10, 2017

Choose a reason for hiding this comment

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

Since you're opted into v15-only features already, you could simplify this file by dropping ToolsVersion and the namespace and changing this line to

<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.props'))" />

(That property function is new to MSBuild 15: dotnet/msbuild#1277)

Copy link
Member

@dsplaisted dsplaisted left a comment

Choose a reason for hiding this comment

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

Looks good except it looks like there's one inadvertant change to a TestAssets project.

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Copy link
Member

Choose a reason for hiding this comment

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

Was this intentionall? I don't think the test projects would need to change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll back out this change.

Copy link
Contributor

Choose a reason for hiding this comment

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

@jonsequitur This still isn't backed out

@jonsequitur jonsequitur force-pushed the BaseIntermediateOutputPath-fix branch 2 times, most recently from 8d102ab to e657a93 Compare February 10, 2017 22:19
@jonsequitur
Copy link
Contributor Author

@srivatsn This is an infrastructure-only change.

@srivatsn
Copy link
Contributor

You can merge without needing approval since this is a infra change.

@nguerrera nguerrera changed the base branch from master to future February 24, 2017 22:27
@nguerrera nguerrera changed the base branch from future to master February 25, 2017 03:02
@srivatsn srivatsn merged commit 350b396 into dotnet:master Feb 28, 2017
mmitche added a commit to mmitche/sdk that referenced this pull request Jun 5, 2020
[release/3.0.1xx] Switch to prod pool
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.

7 participants