Merge branch 'release' into dev

build/cli.version.darwin

@@ -1 +1 @@
-1.0.0-rc2-002611
+1.0.0-rc2-002659

build/cli.version.unix

@@ -1 +1 @@
-1.0.0-rc2-002611
+1.0.0-rc2-002659

build/cli.version.win

@@ -1 +1 @@
-1.0.0-rc2-002611
+1.0.0-rc2-002659

build/shade/_dotnet-test.shade

@@ -15,6 +15,7 @@ configuration=''
 */}
 
 default configuration = 'Debug'
+default test_options=' ${E("KOREBUILD_DOTNET_TEST_OPTIONS")}'
 
 @{
     var content = File.ReadAllText(projectFile);
@@ -30,7 +31,7 @@ default configuration = 'Debug'
             noParallelTestProjects.UnionWith(NO_PARALLEL_TEST_PROJECTS.Split((char)','));
         }
 
-        var testArgs = " --configuration " + configuration;
+        var testArgs = test_options + " --configuration " + configuration;
         if (IsLinux)
         {
             testArgs += " -f netcoreapp1.0";

build/shade/_k-standard-goals.shade

@@ -16,6 +16,9 @@ default BUILD_DIR='${Path.Combine(TARGET_DIR, "build")}'
 default TEST_DIR='${Path.Combine(TARGET_DIR, "test")}'
 default Configuration='${E("Configuration")}'
 default PACKAGELIST_JSON_FILENAME = 'NuGetPackageVerifier.json'
+default SRC_PROJECT_GLOB = "src/*/project.json"
+default TEST_PROJECT_GLOB = "test/*/project.json"
+default SAMPLES_PROJECT_GLOB = "samples/*/project.json"
 
 @{
   if (string.IsNullOrEmpty(E("DOTNET_BUILD_VERSION")))
@@ -95,60 +98,73 @@ default PACKAGELIST_JSON_FILENAME = 'NuGetPackageVerifier.json'
 
 #ci-deep-clean .deep-clean target='clean' if='IsTeamCity'
 
-#build-compile target='compile' if='Directory.Exists("src")'
+#build-compile target='compile'
   @{
-    
-    Directory.CreateDirectory(TARGET_DIR);
-    
-    string commitHash = null;
-    if (AddAssemblyInfo)
+    var projectGlobs = new List<string>();
+    List<string> srcProjects = null;
+
+    if (Directory.Exists("src"))
     {
-        var commitHashFile = Path.Combine(TARGET_DIR, "commit");
-        GitCommand("rev-parse HEAD >> " + commitHashFile);
-        commitHash = File.ReadAllLines(commitHashFile)[0];
+      Directory.CreateDirectory(TARGET_DIR);
+
+      string commitHash = null;
+      if (AddAssemblyInfo)
+      {
+          var commitHashFile = Path.Combine(TARGET_DIR, "commit");
+          GitCommand("rev-parse HEAD >> " + commitHashFile);
+          commitHash = File.ReadAllLines(commitHashFile)[0];
+      }
+
+      srcProjects = Files.Include(SRC_PROJECT_GLOB).ToList();
+      srcProjects.ForEach(projectFile =>
+      {
+          if (AddAssemblyInfo)
+          {
+              var projectText = File.ReadAllText(projectFile);
+              var project = (JsonObject)Json.Deserialize(projectText);
+              var isSharedProject = project.Keys.Contains("shared");
+
+              // We don't want to embed the commit hash in it because 
+              // the consumers would get that file
+              if (!isSharedProject)
+              {
+                  Console.WriteLine("Embedding commit hash in assembly");
+                  var projectFolder = Path.GetDirectoryName(projectFile);
+                  var commitHashAttribute = String.Format("[assembly: System.Reflection.AssemblyMetadata(\"CommitHash\", \"{0}\")]", commitHash);
+
+                  var buildInfoFile = Path.Combine(projectFolder, "BuildInfo.generated.cs");
+                  File.WriteAllText(buildInfoFile, commitHashAttribute);
+              }
+          }
+      });
+
+      projectGlobs.Add(SRC_PROJECT_GLOB);
     }
-  
-    var projectFiles = Files.Include("src/*/project.json").ToList();
-    projectFiles.ForEach(projectFile => 
+    if (!BuildSrcOnly && Directory.Exists("test"))
     {
-        if (AddAssemblyInfo)
+        projectGlobs.Add(TEST_PROJECT_GLOB);
+    }
+    if (!BuildSrcOnly && Directory.Exists("samples"))
+    {
+        projectGlobs.Add(SAMPLES_PROJECT_GLOB);
+    }
+
+    DotnetBuild(string.Join(" ", projectGlobs.ToArray()), Configuration, BuildFramework);
+
+    if (srcProjects != null)
+    {
+        srcProjects.ForEach(projectFile =>
         {
-            var projectText = File.ReadAllText(projectFile);
-            var project = (JsonObject)Json.Deserialize(projectText);
-            var isSharedProject = project.Keys.Contains("shared");
-            
-            // We don't want to embed the commit hash in it because 
-            // the consumers would get that file
-            if (!isSharedProject)
-            {
-                Console.WriteLine("Embedding commit hash in assembly");
-                var projectFolder = Path.GetDirectoryName(projectFile);
-                var commitHashAttribute = String.Format("[assembly: System.Reflection.AssemblyMetadata(\"CommitHash\", \"{0}\")]", commitHash);
-            
-                var buildInfoFile = Path.Combine(projectFolder, "BuildInfo.generated.cs");
-                File.WriteAllText(buildInfoFile, commitHashAttribute);
-            }
+            DotnetPack(projectFile, BUILD_DIR, Configuration, " --no-build");
+        });
+
+        foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR, "*/" + Configuration + "/*.nupkg")))
+        {
+            File.Copy(nupkg, Path.Combine(BUILD_DIR, Path.GetFileName(nupkg)), true);
         }
-        
-        DotnetPack(projectFile, BUILD_DIR, Configuration);
-    });
-
-    foreach (var nupkg in Files.Include(Path.Combine(BUILD_DIR, "*/" + Configuration + "/*.nupkg")))
-    {
-        File.Copy(nupkg, Path.Combine(BUILD_DIR, Path.GetFileName(nupkg)), true);
     }
   }
 
-#build-test target='compile' if='Directory.Exists("test") && !BuildSrcOnly'
-  @{
-    DotnetBuild("test/*/project.json", Configuration, BuildFramework);
-  }
-
-#build-samples target='compile' if='Directory.Exists("samples") && !BuildSrcOnly'
-  @{
-    DotnetBuild("samples/*/project.json", Configuration, BuildFramework);
-  }
-
 #native-compile target='compile' if='!IsLinux && Directory.Exists(Path.Combine(BASE_DIR, "src"))'
   var programFilesX86 = '${Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}'
   var nativeProjects ='${Files.Include(Path.Combine(BASE_DIR, "src", "**", "*.vcxproj"))}'
@@ -205,14 +221,13 @@ default PACKAGELIST_JSON_FILENAME = 'NuGetPackageVerifier.json'
 
 #xunit-test target='test' if='Directory.Exists("test")'
   @{
-    var projectFiles = Files.Include("test/*/project.json");
+    var projectFiles = Files.Include(TEST_PROJECT_GLOB);
     foreach (var projectFile in projectFiles)
     {
-        DotnetTest(projectFile, Configuration);
+        DotnetTest(projectFile, Configuration, " --no-build");
     }
   }
 
-
 #make-roslyn-fast
   ngen-roslyn
 
@@ -385,13 +400,13 @@ macro name='Dotnet' command='string' dotnetDir='string'
 macro name="DotnetBuild" projectFile='string' configuration='string' framework='string'
     dotnet-build
 
-macro name="DotnetPack" projectFile='string' dotnetPackOutputDir='string' configuration='string'
+macro name="DotnetPack" projectFile='string' dotnetPackOutputDir='string' configuration='string' pack_options='string'
     dotnet-pack
 
 macro name="DotnetPublish" projectFile='string' outputFolder='string' framework='string' configuration='string'
     dotnet-publish
 
-macro name="DotnetTest" projectFile='string' configuration='string'
+macro name="DotnetTest" projectFile='string' configuration='string' test_options='string'
     dotnet-test
 
 macro name='Npm' npmCommand='string' npmDir='string'