diff options
| author | Chris Sienkiewicz <chsienki@microsoft.com> | 2018-07-25 11:13:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 11:13:27 -0700 |
| commit | eddc1a621b66d63ac9feda289f08fc0e9f67f850 (patch) | |
| tree | 6fc79a1d2daab52f4e70ef85ab1d068fe064295c /build-test.cmd | |
| parent | 2b92e13d9c015de34b12487131932410148ffb80 (diff) | |
| download | coreclr-eddc1a621b66d63ac9feda289f08fc0e9f67f850.tar.gz coreclr-eddc1a621b66d63ac9feda289f08fc0e9f67f850.tar.bz2 coreclr-eddc1a621b66d63ac9feda289f08fc0e9f67f850.zip | |
Sdk test projects (#19044)
Change the associated targets and props files in the test directory to allow the test csproj's to be built as SDK style projects alongside traditional style projects.
Remove CodeTaskFactory:
- Allows the projects to be built using the core version of msbuild/dotnet build
- Converted to using msbuild property expansion instead
Add directory.build.{props,targets}:
- Currently we just import the dirs.props and targets, but means SDK style projects don't need to explicitly include these files
- We probably want to move all projects over to using these in the future, but this keeps the changes smaller for now
Specific code for SDK projects:
- There are a several changes required to build an SDK project. This change guards them behind conditionals so that only the new style projects see them. When we get to the point that there are only new projects, we can remove the guards (probably at the same time as ditching the dir.props)
Reordered build targets:
- Because SDK projects implicitly import the build targets, we can no longer re-define the build targets unconditionally knowing they will likely be overwritten.
- Instead we move the overwritten targets to separate files, and include these conditionally based on properties. In this way there is always a build defined for SDK projects, which can then be overwritten to do nothing as needed.
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-test.cmd b/build-test.cmd index 31c5ad3857..a688e59528 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -440,7 +440,7 @@ set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" REM Build wrappers using the local SDK's msbuild. As we move to arcade, the other builds should be moved away from run.exe as well. -call %__DotnetHost% msbuild %__ProjectDir%\tests\runtest.proj /p:BuildWrappers=true !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__BuildAgainstPackagesMsbuildArg% %__unprocessedBuildArgs% +call %__DotnetHost% msbuild %__ProjectDir%\tests\runtest.proj /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/ /p:BuildWrappers=true !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__BuildAgainstPackagesMsbuildArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo Xunit Wrapper build failed exit /b 1 |