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

Revert "Fix DataProtection after build globbing changes will go in" 

This reverts commit f0ddc81e07.
This commit is contained in:
Pranav K 2016-05-05 07:14:25 -07:00
parent 95d86a3070
commit 0216221e50
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
makefile.shade
View File

@ -11,11 +11,10 @@ var Configuration_Local = '${E("Configuration")}'
default BASE_DIR_LOCAL='${Directory.GetCurrentDirectory()}' default BASE_DIR_LOCAL='${Directory.GetCurrentDirectory()}'
default TARGET_DIR_LOCAL='${Path.Combine(BASE_DIR_LOCAL, "artifacts")}' default TARGET_DIR_LOCAL='${Path.Combine(BASE_DIR_LOCAL, "artifacts")}'
default BUILD_DIR_LOCAL='${Path.Combine(TARGET_DIR_LOCAL, "build")}' default BUILD_DIR_LOCAL='${Path.Combine(TARGET_DIR_LOCAL, "build")}'
default SRC_PROJECT_GLOB_LOCAL="src/*/project.json"
default TEST_PROJECT_GLOB_LOCAL="test/*/project.json"
#build-compile target='compile' #build-compile target='compile' if='Directory.Exists("src")'
@{ @{
Directory.CreateDirectory(TARGET_DIR_LOCAL); Directory.CreateDirectory(TARGET_DIR_LOCAL);
string commitHash = null; string commitHash = null;
@ -26,12 +25,13 @@ default TEST_PROJECT_GLOB_LOCAL="test/*/project.json"
commitHash = File.ReadAllLines(commitHashFile)[0]; commitHash = File.ReadAllLines(commitHashFile)[0];
} }
var srcProjects = Files.Include(SRC_PROJECT_GLOB_LOCAL).ToList(); var projectFiles = Files.Include("src/*/project.json").ToList();
if (IsLinux) if (IsLinux)
{ {
srcProjects.Remove("src/Microsoft.AspNetCore.DataProtection.SystemWeb/project.json"); projectFiles.Remove("src/Microsoft.AspNetCore.DataProtection.SystemWeb/project.json");
} }
srcProjects.ForEach(projectFile =>
projectFiles.ForEach(projectFile =>
{ {
if (AddAssemblyInfo) if (AddAssemblyInfo)
{ {
@ -51,9 +51,9 @@ default TEST_PROJECT_GLOB_LOCAL="test/*/project.json"
File.WriteAllText(buildInfoFile, commitHashAttribute); File.WriteAllText(buildInfoFile, commitHashAttribute);
} }
} }
DotnetPack(projectFile, BUILD_DIR_LOCAL, Configuration_Local, "");
DotnetPack(projectFile, BUILD_DIR_LOCAL, Configuration_Local);
}); });
DotnetBuild(TEST_PROJECT_GLOB_LOCAL, Configuration_Local, BuildFramework);
foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR_LOCAL, "*/" + Configuration_Local + "/*.nupkg"))) foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR_LOCAL, "*/" + Configuration_Local + "/*.nupkg")))
{ {