提交 5078ee16 编写于 作者: S Stephen Toub 提交者: GitHub

Merge pull request dotnet/corefx#14858 from dotnet-bot/master-UpdateDependencies

Update CoreClr to beta-24904-03 (master)

Commit migrated from https://github.com/dotnet/corefx/commit/1b6d2c37efc6246ffe270910b6e8a99e8658cb16
......@@ -3,8 +3,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.5.0",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00921-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
......
......@@ -2,12 +2,12 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -12,7 +12,7 @@
},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -3,7 +3,7 @@
"netstandard1.7": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -3,8 +3,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.5.0",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00921-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
......
......@@ -3,8 +3,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.5.0",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00921-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
......
......@@ -3,8 +3,8 @@
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.5.0",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.TestHost": "1.2.0-beta-24904-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
"xunit.console.netcore": "1.0.3-prerelease-00921-01",
"Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.0": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
......
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03",
"System.Linq.Expressions": "4.4.0-beta-24904-01",
"System.ObjectModel": "4.4.0-beta-24904-01",
"System.Text.RegularExpressions": "4.4.0-beta-24904-01",
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03",
"System.IO.FileSystem": "4.4.0-beta-24904-01",
"System.Reflection.Metadata": "1.5.0-beta-24904-01"
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"uap10.1": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -12,7 +12,7 @@
},
"netcoreapp1.1": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.0": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
......
......@@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.CSharp": "4.4.0-beta-24904-01",
"Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.Win32.Registry": "4.4.0-beta-24904-01",
"System.Collections": "4.4.0-beta-24904-01",
"System.Collections.NonGeneric": "4.4.0-beta-24904-01",
......@@ -55,7 +55,7 @@
"dependencies": {
"Microsoft.CSharp": "4.4.0-beta-24904-01",
"Microsoft.NETCore.Platforms": "1.2.0-beta-24904-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.Win32.Registry": "4.4.0-beta-24904-01",
"System.Collections": "4.4.0-beta-24904-01",
"System.Collections.NonGeneric": "4.4.0-beta-24904-01",
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -3,7 +3,7 @@
"netstandard1.7": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net462": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net461": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"uap10.1": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcoreapp1.2": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcore50": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"uap10.1": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
}
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03",
"Microsoft.TargetingPack.Private.WinRT": "1.0.3"
}
},
......
......@@ -2,12 +2,12 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"netcoreapp1.2": {
......
......@@ -4,7 +4,7 @@
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0",
"System.Collections.NonGeneric": "4.4.0-beta-24904-01",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03",
"System.Diagnostics.Tools": "4.4.0-beta-24904-01",
"System.Runtime.InteropServices": "4.4.0-beta-24904-01"
}
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"uap10.1": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"uap10.1": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03",
"System.Diagnostics.Debug": "4.4.0-beta-24904-01"
}
},
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
}
},
"net463": {
......
......@@ -18,7 +18,7 @@
-->
<PropertyGroup>
<CoreFxCurrentRef>3c36f9bf01e35591e1bf30fdac512f863643f54f</CoreFxCurrentRef>
<CoreClrCurrentRef>3c36f9bf01e35591e1bf30fdac512f863643f54f</CoreClrCurrentRef>
<CoreClrCurrentRef>71ca1111dc90eb30ceaafbdb1144dd411d712385</CoreClrCurrentRef>
<ExternalCurrentRef>4e2952b5114bfa90cc45eef908204006a771a62b</ExternalCurrentRef>
<ProjectNTfsCurrentRef>3c36f9bf01e35591e1bf30fdac512f863643f54f</ProjectNTfsCurrentRef>
</PropertyGroup>
......@@ -26,7 +26,7 @@
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>beta-24904-01</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>beta-24904-02</CoreClrExpectedPrerelease>
<CoreClrExpectedPrerelease>beta-24904-03</CoreClrExpectedPrerelease>
<ExternalExpectedPrerelease>beta-24727-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-24904-00</ProjectNTfsExpectedPrerelease>
</PropertyGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册