Merge branch 'rel/1.0.0' into pawelka/outname_pack

This commit is contained in:
Piotr Puszkiewicz 2016-04-08 04:27:58 -07:00
commit 85608e42cc
5 changed files with 7 additions and 20 deletions

View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

View file

@ -15,14 +15,6 @@
"type": "build",
"version": "1.0.0-rc2-16453"
},
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-rc2-16453",
"type": "build"
},
"Microsoft.Dnx.Runtime.Sources": {
"version": "1.0.0-rc2-16453",
"type": "build"
},
"System.CommandLine": "0.1.0-e160323-1"
},
"frameworks": {

View file

@ -4,10 +4,13 @@
"emitEntryPoint": true
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23931"
"Microsoft.NETCore.App": {
"version":"1.0.0-rc2-23931",
"type": "platform"
}
}
},
"net451": {}

View file

@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Tools.Run
{
var defaultFrameworks = new[]
{
FrameworkConstants.FrameworkIdentifiers.DnxCore,
FrameworkConstants.FrameworkIdentifiers.NetCoreApp,
FrameworkConstants.FrameworkIdentifiers.NetStandardApp,
};

View file

@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
}
catch (Exception)
{
Thread.Sleep(100);
return false;
}
}