diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-03-02 19:31:29 -0600 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-03-10 09:18:15 -0600 |
| commit | 899d4270b510f5edd1242def8d201b1804dd7683 (patch) | |
| tree | 4cc4bd48c14b788cef6ab067e6323282cad99ed3 /tests/runtest.proj | |
| parent | 2325dea4efa87fc658cb566454e4955f7269ddf6 (diff) | |
| download | coreclr-899d4270b510f5edd1242def8d201b1804dd7683.tar.gz coreclr-899d4270b510f5edd1242def8d201b1804dd7683.tar.bz2 coreclr-899d4270b510f5edd1242def8d201b1804dd7683.zip | |
Add validation to test build.
Don't validate generated files, and make the xunit.runner.msbuild workaround only apply to that specific package.
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index f882a466ea..4c9a6467e6 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -128,7 +128,6 @@ $(_XunitEpilog) "xunit" : "2.1.0", "xunit.assert" : "2.1.0", "xunit.core" : "2.1.0", - "xunit.runner.msbuild": "2.1.0" }, "frameworks": { "net45": { @@ -304,11 +303,33 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> + + <!-- + 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": "2.1.0" }, "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" /> + <!-- Restore all wrapper projects' project.jsons in one pass for perf & to avoid concurrency problems --> <Exec Command="$(DnuRestoreCommand) "$(XunitWrapperGeneratedCSDirBase.TrimEnd('\\'))"" - StandardOutputImportance="Low" - CustomErrorRegularExpression="^Unable to locate .*" - ContinueOnError="WarnAndContinue" /> + StandardOutputImportance="Low" /> + <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> <MSBuild Projects="$(MSBuildProjectFile)" Targets="BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> |