huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ni.dll deletion hack

This commit is contained in:
Pranav K 2016-03-10 08:06:59 -08:00
parent c948605111
commit 864fbbb380
1 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
makefile.shade
View File

@ -87,66 +87,49 @@ var buildTarget = "compile"
Log.Info(string.Format("{0} - {1}", repos.Key, string.Join(", ", repos))); Log.Info(string.Format("{0} - {1}", repos.Key, string.Join(", ", repos)));
} }
// Hack: Delete cross-gen binaries to prevent csc.exe from AVE foreach (var batch in batchedRepos)
var cliDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "dotnet", "cli", "bin");
foreach (var file in Directory.GetFiles(cliDirectory, "*.ni.dll").Where(f => !Path.GetFileName(f).StartsWith("mscorlib")))
{ {
File.Move(file, Path.ChangeExtension(file, ".bak")); Parallel.ForEach(batch, new ParallelOptions { MaxDegreeOfParallelism = 4 }, repo =>
}
try
{
foreach (var batch in batchedRepos)
{ {
Parallel.ForEach(batch, new ParallelOptions { MaxDegreeOfParallelism = 4 }, repo => var blockName = string.Format("Building {0}", repo);
if (blockLogger != null)
{ {
var blockName = string.Format("Building {0}", repo); blockLogger.StartBlock(blockName);
}
if (blockLogger != null) Log.Info(blockName);
Exec(CreateBuildWithFlowId(repo), buildTarget, repo);
var repoArtifacts = Path.Combine(repo, "artifacts", "build");
if (Directory.Exists(repoArtifacts))
{
foreach (var source in Directory.EnumerateFiles(repoArtifacts, "*.nupkg"))
{ {
blockLogger.StartBlock(blockName); File.Copy(source, Path.Combine(universeArtifacts, Path.GetFileName(source)), overwrite: true);
} }
Log.Info(blockName); if (!string.IsNullOrEmpty(ciVolatileShare))
Exec(CreateBuildWithFlowId(repo), buildTarget, repo);
var repoArtifacts = Path.Combine(repo, "artifacts", "build");
if (Directory.Exists(repoArtifacts))
{ {
foreach (var source in Directory.EnumerateFiles(repoArtifacts, "*.nupkg")) Log.Info("Publishing packages to " + ciVolatileShare);
if (string.IsNullOrEmpty(nugetExe))
{ {
File.Copy(source, Path.Combine(universeArtifacts, Path.GetFileName(source)), overwrite: true); Log.Warn("PUSH_NUGET_EXE not specified.");
} }
else
if (!string.IsNullOrEmpty(ciVolatileShare))
{ {
Log.Info("Publishing packages to " + ciVolatileShare); NuGetPackagesAdd(repoArtifacts, ciVolatileShare);
if (string.IsNullOrEmpty(nugetExe))
{
Log.Warn("PUSH_NUGET_EXE not specified.");
}
else
{
NuGetPackagesAdd(repoArtifacts, ciVolatileShare);
}
} }
} }
}
Log.Info(string.Format("Build {0} succeeded", repo)); Log.Info(string.Format("Build {0} succeeded", repo));
if (blockLogger != null) if (blockLogger != null)
{ {
blockLogger.EndBlock(blockName); blockLogger.EndBlock(blockName);
} }
}); });
}
}
finally
{
foreach (var file in Directory.GetFiles(cliDirectory, "*.ni.bak"))
{
File.Move(file, Path.ChangeExtension(file, ".dll"));
}
} }
} }