This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Allow test projects to be SDK style #18810
Closed
Closed
Changes from 18 commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
313449f
Only include Build.Common.targets when using buildtools
chsienki 78b00de
Move some dir.targets into a diffent file so we can exclude them for …
chsienki 8959ebe
Add Directory.Build.{targets, props} that redirect to dirs.{props, ta…
chsienki bb32b49
Remove extra slash from Base[Intermediate]OutputPath on tests
chsienki dce8e68
Rename targetassemblyname extension to dll
chsienki 1762942
Rename nosdk targets file, and import it when neccesary
chsienki 251c232
Enable required properties for sdk properties at the root dirs.props
chsienki b17cff6
Remove code task factory: generate the param list using msbuild synta…
chsienki 66f84de
Revert "Rename targetassemblyname extension to dll"
chsienki f2ae5a9
Force tests to have .exe extension rather than dll when they are exec…
chsienki 34f6d3a
Fix dir.targets build imports so that we correctly include buildtools…
chsienki dbaa803
Always include the nobuild targets if we're a run only project
chsienki 78d4089
Remove runtime references in override.targets when referencing System…
chsienki ed2feaf
Merge branch 'master' into sdk_projects
chsienki b31c3ac
Add comments to Directory.Build.props,targets to explain usage
chsienki d9720b5
Split out nobuild and runonlybuild into two targets files to make the…
chsienki 34b66a4
Rename runonlybuild.targets
chsienki 613f9a0
Fix for SDK projects referencing system.private.corelib
chsienki 0c32d18
Initial change to allow build wrappers and runtest.py
23d8627
Build xunit wrappers on unix
sbomer 2889281
Correctly generate TestEnv xplat
4a2f434
Build xunit wrappers using SDK
sbomer 0be3ded
Target netcoreapp2.0 in xunit wrappers
sbomer 0ebb165
Restore to packages directory for xunit wrappers
sbomer 5055fd4
Move common properties out to dir.common.props
sbomer df7b2f3
Remove desktop-specific test wrapper csproj
sbomer 0963074
Pass build os/arch/type and logsdir to msbuild from runtest.py
sbomer 41c25f3
Remove xunit wrapper helper library from travernal build
sbomer bf93ab2
Fix parameter passing in build-test.sh
sbomer 2cc7024
Clean up factored .props files
sbomer 493a4b8
Undo runtest.sh changes
sbomer 379bc34
Use latest xunit console runner everywhere
sbomer 4ccf85e
Remove extra StaticDependency on xunit.runner.console
sbomer 51fae78
Eliminate tests/src/dir.common.props, and rename dir.sdkbuild.props
sbomer 9c49d85
Reintroduce dir.sdkbuild.props as a place for SDK-only props
sbomer db49431
Add xml namespace to dir.common.props
sbomer 8aed5fd
Satisfy xunit analyzer
sbomer 89ba5c1
Satisfy xunit analyzer again
sbomer c5860f0
Use SDK msbuild to build wrappers
sbomer 71d0327
Remove Microsoft.CSharp.Core.targets workaround
sbomer 96a11ef
Remove UseRoslynCompilers prop and unify roslyn import
sbomer 98a9614
Merge branch 'unify_test_runner' of https://github.com/sbomer/coreclr…
chsienki 98a1b2c
Merge branch 'master' of https://github.com/dotnet/coreclr into merge…
chsienki 8814d88
Remove duplicate properties
chsienki 3f2c0cd
Don't import dirs.props/targets in coreclr.testwrapper
chsienki 7f61eac
Merge branch 'master' of https://github.com/dotnet/coreclr into sdk_p…
chsienki 6111010
Fix build for vs2015
chsienki 829c52b
Undo fix for test wrapper.
chsienki 5280198
Add dummy directory.build.props/targets to common folder to prevent t…
chsienki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<Project> | ||
<!-- SDK Style projects auto-magically include this file. | ||
We include the dir.props for them here so they partake in the old | ||
style of build without them needing to explicitly include anything --> | ||
<Import Project="dir.props" Condition="'$(UsingMicrosoftNETSdk)' == 'true'" /> | ||
</Project> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<Project> | ||
<!-- SDK Style projects auto-magically include this file. | ||
We include the dir.targets for them here so they partake in the old | ||
style of build without them needing to explicitly include anything --> | ||
<Import Project="dir.targets" Condition="'$(UsingMicrosoftNETSdk)' == 'true'" /> | ||
</Project> |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<Project> | ||
|
||
<Target Name="CreateManifestResourceNames" /> | ||
<Target Name="Compile" /> | ||
<Target Name="CoreCompile" /> | ||
<Target Name="Build" /> | ||
|
||
</Project> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<Project> | ||
|
||
<Target Name="CreateManifestResourceNames" /> | ||
<Target Name="Compile" /> | ||
<Target Name="CoreCompile" /> | ||
|
||
<!-- if this is a RunOnly project that has been scheduled to build, make the output directory and build any dependent projects --> | ||
<Target Name="Build" Condition="('$(CLRTestKind)'=='RunOnly') And '$(_WillCLRTestProjectBuild)'"> | ||
<MSBuild Projects="@(ProjectReference)" /> | ||
<MakeDir ContinueOnError="false" Directories="$(OutputPath)" /> | ||
</Target> | ||
|
||
</Project> |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How are these getting duplicated? Wouldn't it be better to try and eliminate the duplication instead of fixing it after the fact?