diff options
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index c02b8c8f9f..acc4545d92 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -64,7 +64,6 @@ $(_XunitEpilog) ]]> </_XunitWrapperGen> - <XunitVersionCompiled>2.1.0</XunitVersionCompiled> <XunitWrapperGenCsProj> <![CDATA[ <?xml version="1.0" encoding="utf-8"?> @@ -120,7 +119,6 @@ $(_XunitEpilog) <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$(SourceDir)dir.targets" /> - <Import Project="$(ProjectDir)helix.targets" /> <PropertyGroup> <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir> </PropertyGroup> @@ -307,31 +305,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). </Target> <Target Name="CreateAllWrappers" DependsOnTargets="GetListOfTestCmds;FindCmdDirectories"> - <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> - - <!-- - Contents of a project.json that will be restored once with errors turned off. This works - around the package being incompatible with dotnet restore. Only the package contents are - required so the compatibility errors can be ignored. - --> - <PropertyGroup> - <XunitRunnerRestoreGenConfig>{ "dependencies": { "xunit.runner.msbuild": "$(XunitPackageVersion)" }, "frameworks": { "net45": {} } }</XunitRunnerRestoreGenConfig> - <XunitRunnerRestoreProjectDir>$(BaseOutputPath)\tempRestoreProject</XunitRunnerRestoreProjectDir> - <XunitRunnerRestoreProjectJsonPath>$(XunitRunnerRestoreProjectDir)\project.json</XunitRunnerRestoreProjectJsonPath> - </PropertyGroup> - - <MakeDir Directories="$(XunitRunnerRestoreProjectDir)" /> - <WriteLinesToFile File="$(XunitRunnerRestoreProjectJsonPath)" - Lines="$(XunitRunnerRestoreGenConfig)" - Overwrite="true" /> - - <Exec Command="$(DnuRestoreCommand) "$(XunitRunnerRestoreProjectJsonPath)"" - StandardOutputImportance="Low" - CustomErrorRegularExpression="^Unable to resolve .*" - IgnoreExitCode="true" - IgnoreStandardErrorWarningFormat="true" /> - - <MSBuild Projects="$(MSBuildProjectFile)" Targets="BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> + <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper;BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> </Target> <Target Name="GetListOfTestCmds"> @@ -349,6 +323,28 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). Properties="Language=C#" /> </Target> + <Target Name="CreateNonWindowsTestOverlay"> + <MSBuild Projects="$(MSBuildProjectFile)" + Targets="CopyNonWindowsDependecyToCoreRoot" + Properties="Language=C#;NonWindowsRuntimeId=$(NonWindowsRuntimeId)" /> + </Target> + + <Target Name="BinPlaceRef"> + <!-- Copy mscorlib.dll from TargetingPack to bin/Product/ref, if we're building against packages --> + <MSBuild Projects="$(MSBuildProjectFile)" + Targets="CopyDependencyToRef" + Properties="Language=C#" + Condition=" '$(BuildTestsAgainstPackages)'=='true' " /> + </Target> + + <Target Name="BinPlaceProduct"> + <!-- Copy test dependencies to bin/Product, if we're building against packages --> + <MSBuild Projects="$(MSBuildProjectFile)" + Targets="CopyDependencyToProduct" + Properties="Language=C#" + Condition=" '$(BuildTestsAgainstPackages)'=='true' " /> + </Target> + <!-- All the test projects need to add dependency to currently built runtime as they require that to run. In addition the version number of built runtime can change so all project.json needs to be dynamically generated. Instead the following task creates a project.json with dependencies like Microsoft.netcore.runtime.coreclr ..etc. |