Run tests on both net45 and k10 (Fix #42)
This commit is contained in:
parent
71a77685e6
commit
c2a22b57b0
|
|
@ -28,31 +28,45 @@ projectFile=''
|
||||||
object configsObject;
|
object configsObject;
|
||||||
var configs = project.TryGetValue("configurations", out configsObject)
|
var configs = project.TryGetValue("configurations", out configsObject)
|
||||||
? (Dictionary<string, object>)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
|
// Currently only net* and k* targets are supported. See aspnet/Universe#53
|
||||||
var targetFrameworks = configs.Keys.Where(k => k.StartsWith("net", StringComparison.OrdinalIgnoreCase) /*
|
var targetFrameworks = configs.Keys.Where(k => k.StartsWith("net", StringComparison.OrdinalIgnoreCase)
|
||||||
|| k.StartsWith("k", StringComparison.OrdinalIgnoreCase) */ );
|
|| k.StartsWith("k", StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
var originalTargetFramework = Environment.GetEnvironmentVariable("TARGET_FRAMEWORK");
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
foreach (var framework in targetFrameworks)
|
foreach (var framework in targetFrameworks)
|
||||||
{
|
{
|
||||||
// Workaround for aspnet/KRuntime#129
|
if (framework.StartsWith("net", StringComparison.OrdinalIgnoreCase))
|
||||||
var frameworkString = framework.StartsWith("net", StringComparison.OrdinalIgnoreCase)
|
{
|
||||||
? ""
|
UseSvr50();
|
||||||
: framework;
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UseSvrc50();
|
||||||
|
}
|
||||||
|
|
||||||
Environment.SetEnvironmentVariable("TARGET_FRAMEWORK", frameworkString);
|
|
||||||
K("test", projectFolder);
|
K("test", projectFolder);
|
||||||
}
|
}
|
||||||
} finally
|
} finally
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("TARGET_FRAMEWORK", originalTargetFramework);
|
UseSvr50();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
macro name='K' command='string' workingdir='string'
|
macro name='K' command='string' workingdir='string'
|
||||||
k
|
k
|
||||||
|
|
||||||
|
macro name='UseSvr50'
|
||||||
|
exec program='cmd' commandline='/C kvm use default -svr50 -x86' if='!IsMono'
|
||||||
|
exec program='kvm' commandline='use default -svr50 -x86' if='IsMono'
|
||||||
|
|
||||||
|
macro name='UseSvrc50'
|
||||||
|
exec program='cmd' commandline='/C kvm use default -svrc50 -x86' if='!IsMono'
|
||||||
|
exec program='kvm' commandline='use default -svrc50 -x86' if='IsMono'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue