Remove all our path antics; force native projects to bin/, obj/ #8062
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… obj/ This commit fixes our longstanding build artifact output issues and finally unifies all C++ project output into bin/ and obj/. I've removed NoOutputRedirection. I validated this change by running repeated incremental builds after changing individual .cpp files in many of our C++/WinRT projects.
|
The only projects that emit binaries into src/ or / are now CascadiaPackage and the .NET projects. It is possible to resolve this, but I wanted to move them slowly. |
zadjii-msft
approved these changes
Oct 27, 2020
miniksa
reviewed
Oct 27, 2020
| <ProjectGuid>{b0ac39d6-7b40-49a9-8202-58549bae1fb1}</ProjectGuid> | ||
| <ProjectName>WindowsTerminalUniversal</ProjectName> | ||
| <RootNamespace>WindowsTerminalUniversal</RootNamespace> | ||
| <DefaultLanguage>en-US</DefaultLanguage> |
|
Decided I should make TestHostApp live in a subdir ;P because I lost that when I forcibly disabled the project-specific output directory. |
miniksa
reviewed
Oct 27, 2020
| @@ -2,55 +2,6 @@ | |||
| <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||
| <Import Project="$(MSBuildThisFileDirectory)common.build.post.props" /> | |||
|
|
|||
| <!-- For Cascadia projects, we want to copy the output dll up a directory | |||
There was a problem hiding this comment.
Beautiful. Brings a tear to my eye.
miniksa
approved these changes
Oct 27, 2020
|
I love this. Thank you for taking the time to pull this together. |
DHowett
changed the title
LuanVSO
reviewed
Oct 28, 2020
| (xcopy /Y "$(SolutionDir)$(Platform)\$(Configuration)\TerminalControl\TerminalControl.dll" "$(OutDir)\TerminalControl.dll*" ) | ||
| (xcopy /Y "$(OpenConsoleCommonOutDir)\TerminalConnection\TerminalConnection.dll" "$(OutDir)\TerminalConnection.dll*" ) | ||
| (xcopy /Y "$(OpenConsoleCommonOutDir)\TerminalSettings\TerminalSettings.dll" "$(OutDir)\TerminalSettings.dll*" ) | ||
| (xcopy /Y "$(OpenConsoleCommonOutDir)\TerminalControl\TerminalControl.dll" "$(OutDir)\TerminalControl.dll*" ) |
There was a problem hiding this comment.
how many different copy commands are there on windows?
because i can cite at least 3 off the top of my head
There was a problem hiding this comment.
We probably used all three in the same project here 😉
2 tasks
ghost
pushed a commit
that referenced
this pull request
Jan 26, 2021
## Summary of the Pull Request Apparently, we don't need this `TargetRuntime`. That's what was causing VS to think that we were a C# project, and give us that warning. This is the solution we got from the owner of the `.wapproj` plugin. ## References * Introduced in c33883d, in PR #8062 ## PR Checklist * [x] Closes #8301 * [x] I work here Build and ran it fine. Changed TermControl, built and ran it fine. Now let's hope CI likes it.
mpela81
pushed a commit
to mpela81/terminal
that referenced
this pull request
Jan 28, 2021
## Summary of the Pull Request Apparently, we don't need this `TargetRuntime`. That's what was causing VS to think that we were a C# project, and give us that warning. This is the solution we got from the owner of the `.wapproj` plugin. ## References * Introduced in c33883d, in PR microsoft#8062 ## PR Checklist * [x] Closes microsoft#8301 * [x] I work here Build and ran it fine. Changed TermControl, built and ran it fine. Now let's hope CI likes it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes our longstanding build artifact output issues and
finally unifies all C++ project output into bin/ and obj/.
In light of that, I've removed NoOutputRedirection.
I've also updated WTU and U8U16Test to use our common build props and
fixed any warnings/compilation errors that popped out.
I validated this change by running repeated incremental builds after
changing individual .cpp files in many of our C++/WinRT projects.