From efd257a7bed52bca6efc34a89bcba4752b64a52f Mon Sep 17 00:00:00 2001
From: Brice Lambson <bricelam@microsoft.com>
Date: Tue, 10 Jun 2014 11:14:28 -0700
Subject: [PATCH] Run tests on both k10 and net45

---
 build/_k-test.shade | 32 +++++++++++++++-----------------
 build/_k.shade      |  8 +++++++-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/build/_k-test.shade b/build/_k-test.shade
index 6f9797c439..86b119782a 100644
--- a/build/_k-test.shade
+++ b/build/_k-test.shade
@@ -28,31 +28,29 @@ projectFile=''
         object configsObject;
         var configs = project.TryGetValue("configurations", out configsObject)
             ? (Dictionary<string, object>)configsObject
-            : new Dictionary<string, object>();
+            : new Dictionary<string, object>
+                {
+                    { "net45", new Dictionary<string, object>() },
+                    { "k10", new Dictionary<string, object>() }
+                };
         
         // Currently only net* and k* targets are supported. See aspnet/Universe#53
-        var targetFrameworks = configs.Keys.Where(k => k.StartsWith("net", StringComparison.OrdinalIgnoreCase) /*
-                                                    || k.StartsWith("k", StringComparison.OrdinalIgnoreCase) */ );
+        var targetFrameworks = configs.Keys.Where(k => k.StartsWith("net", StringComparison.OrdinalIgnoreCase)
+                                                    || k.StartsWith("k", StringComparison.OrdinalIgnoreCase));
         
-        var originalTargetFramework = Environment.GetEnvironmentVariable("TARGET_FRAMEWORK");
-        try
+        foreach (var framework in targetFrameworks)
         {
-            foreach (var framework in targetFrameworks)
+            if (framework.StartsWith("net", StringComparison.OrdinalIgnoreCase))
             {
-                // Workaround for aspnet/KRuntime#129
-                var frameworkString = framework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
-                    ? ""
-                    : framework;
-
-                Environment.SetEnvironmentVariable("TARGET_FRAMEWORK", frameworkString);
-                K("test", projectFolder);
+                K("test", projectFolder, "");
+            }
+            else if (!IsMono)
+            {
+                K("test", projectFolder, "default -svrc50");
             }
-        } finally
-        {
-            Environment.SetEnvironmentVariable("TARGET_FRAMEWORK", originalTargetFramework);
         }
     }
 }
 
-macro name='K' command='string' workingdir='string'
+macro name='K' command='string' workingdir='string' kvmUse='string'
     k
\ No newline at end of file
diff --git a/build/_k.shade b/build/_k.shade
index 529b7fa649..f15d1fc4f9 100644
--- a/build/_k.shade
+++ b/build/_k.shade
@@ -4,8 +4,14 @@ k
     Run klr commands in your project. Executes k sdk.
 
 command=''
+kvmUse=''
 
 */}
 
-exec program='cmd' commandline='/C k ${command}' if='!IsMono'
+default kvmUse=''
+
+var kvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\kvm'
+
+exec program='cmd' commandline='/C k ${command}' if='!IsMono && string.IsNullOrEmpty(kvmUse)'
+exec program='cmd' commandline='/C "${kvmPath}" use ${kvmUse} && k ${command}' if='!IsMono && !string.IsNullOrEmpty(kvmUse)'
 exec program='k' commandline='${command}' if='IsMono'