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

Merge branch 'release' into dev

This commit is contained in:
Brice Lambson 2015-01-22 14:54:18 -08:00
parent 931d7c4774 a307bb7009
commit 64640f4953
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile.shade
View File

@ -19,7 +19,6 @@ functions
// The repos list is topologically sorted based on build order // The repos list is topologically sorted based on build order
"Configuration", "Configuration",
"Caching", "Caching",
"DataCommon",
"DataProtection", "DataProtection",
"DependencyInjection", "DependencyInjection",
"Options", "Options",
@ -47,7 +46,7 @@ functions
}; };
// Doesn't build on Mono since their contracts don't match // Doesn't build on Mono since their contracts don't match
string[] excludeReposOnMono = new[] { "DataCommon", "Helios" }; string[] excludeReposOnMono = new[] { "Helios" };
static bool useHttps = UseHttps(BASE_DIR); static bool useHttps = UseHttps(BASE_DIR);
static string gitHubUriPrefix = useHttps ? "https://github.com/aspnet/" : "git@github.com:aspnet/"; static string gitHubUriPrefix = useHttps ? "https://github.com/aspnet/" : "git@github.com:aspnet/";
@ -414,7 +413,6 @@ functions
var nonDefaultRepos = new[] var nonDefaultRepos = new[]
{ {
"KRuntime", "KRuntime",
"SqlClient",
"MusicStore" "MusicStore"
}; };
return Enumerable.Concat(repos, nonDefaultRepos); return Enumerable.Concat(repos, nonDefaultRepos);