diff options
author | Davis Goodin <dagood@users.noreply.github.com> | 2017-03-07 02:58:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-07 02:58:29 +0300 |
commit | 13e3d9615a0af6473a60ff86be8474f6ac3b136c (patch) | |
tree | cf027b26aee0723e6c10be0b9d387e26a7c25b4d | |
parent | c32cf8bc9b75487df7d424854c2d8062ddf4f964 (diff) | |
parent | cfd68d5ea2cb53c4d9dfb0d4c639580e2c21373b (diff) |
Merge pull request #16793 from dagood/master-UpdateDependencies
Update CoreClr, CoreFx, Standard to beta-25106-02, beta-25106-01, beta-25106-01, respectively (master)
-rw-r--r-- | dependencies.props | 12 | ||||
-rw-r--r-- | external/ilasm/project.json.template | 6 | ||||
-rw-r--r-- | external/netstandard/netstandard1.x/project.json.template | 2 | ||||
-rw-r--r-- | external/netstandard/project.json.template | 2 | ||||
-rw-r--r-- | external/runtime/project.json.template | 6 | ||||
-rw-r--r-- | external/test-runtime/project.json | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/dependencies.props b/dependencies.props index c886b3ae5f..afbcf0e361 100644 --- a/dependencies.props +++ b/dependencies.props @@ -17,21 +17,21 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> <PropertyGroup> - <CoreFxCurrentRef>0f63ef5a159c7cd37724ae17b05bf956dfb79b52</CoreFxCurrentRef> - <CoreClrCurrentRef>1c4a59f686ba747727efcddb87b0322b9c48261b</CoreClrCurrentRef> + <CoreFxCurrentRef>955fc73c2b773ed2377d020107a2c79524c2cdee</CoreFxCurrentRef> + <CoreClrCurrentRef>955fc73c2b773ed2377d020107a2c79524c2cdee</CoreClrCurrentRef> <ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef> <ProjectNTfsCurrentRef>d9076a006edfd716b4b54d702703fcb1f5575619</ProjectNTfsCurrentRef> <SniCurrentRef>05650e53f2aa4497f74cd6e9b053d3f69f64b0bd</SniCurrentRef> - <StandardCurrentRef>1fcc52093fa372901c516f23293e8b8350c54027</StandardCurrentRef> + <StandardCurrentRef>955fc73c2b773ed2377d020107a2c79524c2cdee</StandardCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>stable</CoreFxExpectedPrerelease> - <CoreClrExpectedPrerelease>beta-25103-01</CoreClrExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-25106-01</CoreFxExpectedPrerelease> + <CoreClrExpectedPrerelease>beta-25106-02</CoreClrExpectedPrerelease> <ExternalExpectedPrerelease>beta-25016-01</ExternalExpectedPrerelease> <ProjectNTfsExpectedPrerelease>beta-25028-00</ProjectNTfsExpectedPrerelease> - <NETStandardPackageVersion>2.0.0-beta-25102-01</NETStandardPackageVersion> + <NETStandardPackageVersion>2.0.0-beta-25106-01</NETStandardPackageVersion> <NETStandardPackageId>NETStandard.Library</NETStandardPackageId> <!-- Use the SNI runtime package --> <SniPackageVersion>4.4.0-beta-25007-02</SniPackageVersion> diff --git a/external/ilasm/project.json.template b/external/ilasm/project.json.template index a1a13a18df..11571f79cf 100644 --- a/external/ilasm/project.json.template +++ b/external/ilasm/project.json.template @@ -2,9 +2,9 @@ "frameworks": { "{TFM}": { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25103-01", - "Microsoft.NETCore.ILAsm": "2.0.0-beta-25103-01" + "Microsoft.NETCore.Platforms": "2.0.0-beta-25106-01", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25106-02", + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25106-02" } } }, diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template index 4f56b716d1..2d78a5d4d7 100644 --- a/external/netstandard/netstandard1.x/project.json.template +++ b/external/netstandard/netstandard1.x/project.json.template @@ -2,7 +2,7 @@ "frameworks": { "{TFM}": { "dependencies": { - "NETStandard.Library": "2.0.0-beta-25102-01", + "NETStandard.Library": "2.0.0-beta-25106-01", "System.Diagnostics.Contracts": "4.3.0", "System.Diagnostics.Debug": "4.3.0", "System.Dynamic.Runtime": "4.3.0", diff --git a/external/netstandard/project.json.template b/external/netstandard/project.json.template index b5f42ec6c7..88405e4872 100644 --- a/external/netstandard/project.json.template +++ b/external/netstandard/project.json.template @@ -2,7 +2,7 @@ "frameworks": { "{TFM}": { "dependencies": { - "NETStandard.Library": "2.0.0-beta-25102-01" + "NETStandard.Library": "2.0.0-beta-25106-01" } } } diff --git a/external/runtime/project.json.template b/external/runtime/project.json.template index 640ebcc56d..308095638b 100644 --- a/external/runtime/project.json.template +++ b/external/runtime/project.json.template @@ -2,9 +2,9 @@ "frameworks": { "{TFM}": { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25103-01", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25103-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25106-01", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25106-02", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25106-02", "runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24913-02", "Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00", "Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00" diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json index bd8f721196..537db95723 100644 --- a/external/test-runtime/project.json +++ b/external/test-runtime/project.json @@ -1,7 +1,7 @@ { "dependencies": { "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04", + "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01401-04", "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01401-04", "xunit.performance.api": "1.0.0-alpha-build0049", "xunit.performance.core": "1.0.0-alpha-build0049", |