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

Rename SDK build directory to "targets" in source and layout #1985

Merged
merged 2 commits into from
Feb 23, 2018

Conversation

dsplaisted
Copy link
Member

This renames the build folder (not at the root of the repo, but the one with the Microsoft.NET.Sdk targets) to "targets". This is mostly because GitHub code search and file finder ignore files in a folder named build.

This also gets rid of the buildCrossTargeting folder, by renaming buildCrossTargeting/Microsoft.NET.Sdk.targets to targets/Microsoft.NET.Sdk.CrossTargeting.targets.

@nguerrera had concerns that renaming these files would cause merge conflicts when integrating changes to the renamed files from other branches, but I tried this out locally with some simple changes and they automatically merged correctly.

Fixes #1071

<None Include="..\Common\Resources\xlf\**\*" LinkBase="Resources\xlf" />
</ItemGroup>

<ItemGroup>
<Folder Include="buildCrossTargeting\" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Delete this.

@dsplaisted dsplaisted merged commit 6945e36 into dotnet:master Feb 23, 2018
JL03-Yue pushed a commit that referenced this pull request Mar 19, 2024
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.

2 participants