From 1972ec27c9a570460dde377ff910325b0017507b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 6 Jul 2015 16:12:43 -0700 Subject: Move CoreCLR to the modern build tools and dnx This changes moves coreclr onto DNX (same version as corefx). Theoretically, this should allow these tests to target the desktop CLR. All of the old package.config files are gone and replaced with corresponding project.json files. The up front restore behavior is retained. Tests are now buildable individually, though not runnable in a similar fashion. --- dir.targets | 124 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 102 insertions(+), 22 deletions(-) (limited to 'dir.targets') diff --git a/dir.targets b/dir.targets index 043e84f13d..fd2dcd335d 100644 --- a/dir.targets +++ b/dir.targets @@ -1,43 +1,123 @@ - - + + + -
+
+ maxTries) + { + throw; + } + else + { + Log.LogMessage(MessageImportance.High, "Download failed, retrying: {0}", e.Message); + } + } + } + + try + { + if (!File.Exists(FileName)) + File.Move(tempFile, FileName); + } + finally + { + if (File.Exists(tempFile)) + File.Delete(tempFile); + } ]]> + + + + Inputs="$(MSBuildThisFileDirectory)dir.props;$(SourceDir).nuget/packages.$(OsEnvironment).config" + Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)"> + + + - + + + + + + <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.$(OsEnvironment).config" + - + + + + + + + + + + + - + + + + - \ No newline at end of file + + + + + + -- cgit v1.2.3