Skip to content

Commit

Permalink
Merge pull request #1588 from StephenBonikowsky/UpdateToCoreFx24530-04
Browse files Browse the repository at this point in the history
Updating CoreFx dependency to version preview1-24530-04
  • Loading branch information
StephenBonikowsky authored Oct 10, 2016
2 parents ce42eb1 + faf73d0 commit eb2eee8
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions dependencies.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
<CoreFxCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</CoreFxCurrentRef>
<CoreClrCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</CoreClrCurrentRef>
<WcfCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</WcfCurrentRef>
<CoreFxCurrentRef>2a585e9694f0087d39f3d508088245988a7179a6</CoreFxCurrentRef>
<CoreClrCurrentRef>20282ecca31a2a9d8eba8ca4a01e79e7a8458d1d</CoreClrCurrentRef>
<WcfCurrentRef>2a585e9694f0087d39f3d508088245988a7179a6</WcfCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-24530-03</CoreFxExpectedPrerelease>
<CoreFxExpectedPrerelease>preview1-24530-04</CoreFxExpectedPrerelease>
</PropertyGroup>

<!-- Package dependency verification/auto-upgrade configuration. -->
Expand Down
2 changes: 1 addition & 1 deletion pkg/baseline/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.Private.PackageBaseline": "1.0.1-preview1-24530-03"
"Microsoft.Private.PackageBaseline": "1.0.1-preview1-24530-04"
},
"frameworks": {
"netstandard1.0": {}
Expand Down
22 changes: 11 additions & 11 deletions src/Common/test-runtime/project.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-03",
"Microsoft.NETCore.Targets": "1.1.0-preview1-24530-03",
"Microsoft.NETCore.TestHost": "1.1.0-preview1-24529-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-preview1-24529-02",
"System.Diagnostics.Contracts": "4.3.0-preview1-24530-03",
"System.IO.Compression": "4.3.0-preview1-24530-03",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0-preview1-24530-03",
"System.Linq.Parallel": "4.3.0-preview1-24530-03",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-04",
"Microsoft.NETCore.Targets": "1.1.0-preview1-24530-04",
"Microsoft.NETCore.TestHost": "1.1.0-preview1-24608-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-preview1-24608-01",
"System.Diagnostics.Contracts": "4.3.0-preview1-24530-04",
"System.IO.Compression": "4.3.0-preview1-24530-04",
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0-preview1-24530-04",
"System.Linq.Parallel": "4.3.0-preview1-24530-04",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
"coveralls.io": "1.4",
"OpenCover": "4.6.519",
"ReportGenerator": "2.4.3",
Expand All @@ -18,14 +18,14 @@
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03",
"xunit.console.netcore": "1.0.3-prerelease-00704-04",
"System.Net.Security": "4.3.0-preview1-24530-03"
"System.Net.Security": "4.3.0-preview1-24530-04"
},
"frameworks": {
"netstandard1.3": {},
"uap10.0": {
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.1-beta-000547-00",
"System.Console": "4.3.0-preview1-24530-03",
"System.Console": "4.3.0-preview1-24530-04",
"microsoft.xunit.runner.uwp": "1.0.3-prerelease-00614-01",
"Microsoft.DotNet.TestILC": {
"version": "1.4.24208-prerelease",
Expand Down
6 changes: 3 additions & 3 deletions src/System.Private.ServiceModel/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"System.Net.Primitives": "4.0.10",
"System.Net.WebHeaderCollection": "4.0.0",
"System.Net.WebSockets": "4.0.0",
"System.Net.WebSockets.Client": "4.3.0-preview1-24530-03",
"System.Net.WebSockets.Client": "4.3.0-preview1-24530-04",
"System.ObjectModel": "4.0.0",
"System.Reflection": "4.0.10",
"System.Reflection.DispatchProxy": "4.0.0",
Expand All @@ -36,7 +36,7 @@
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Runtime.Serialization.Xml": "4.1.0",
"System.Security.Claims": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
"System.Security.Principal": "4.0.0",
"System.Text.Encoding": "4.0.10",
"System.Text.Encoding.Extensions": "4.0.10",
Expand All @@ -55,7 +55,7 @@
],
"dependencies": {
"System.Net.NameResolution": "4.0.0",
"System.Net.Security": "4.3.0-preview1-24530-03",
"System.Net.Security": "4.3.0-preview1-24530-04",
"System.Net.Sockets": "4.1.0",
"System.Security.Principal.Windows": "4.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Private.ServiceModel/src/windows/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"System.Runtime.Serialization.Xml": "4.1.0",
"System.Security.Claims": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
"System.Security.Principal": "4.0.0",
"System.Text.Encoding": "4.0.10",
"System.Text.Encoding.Extensions": "4.0.10",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-03",
"System.Collections": "4.3.0-preview1-24530-03",
"System.Collections.Specialized": "4.3.0-preview1-24530-03",
"System.Console": "4.3.0-preview1-24530-03",
"System.Diagnostics.Debug": "4.3.0-preview1-24530-03",
"System.Diagnostics.Tools": "4.3.0-preview1-24530-03",
"System.Linq": "4.3.0-preview1-24530-03",
"System.Net.Http": "4.3.0-preview1-24530-03",
"System.Net.Sockets": "4.3.0-preview1-24530-03",
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-04",
"System.Collections": "4.3.0-preview1-24530-04",
"System.Collections.Specialized": "4.3.0-preview1-24530-04",
"System.Console": "4.3.0-preview1-24530-04",
"System.Diagnostics.Debug": "4.3.0-preview1-24530-04",
"System.Diagnostics.Tools": "4.3.0-preview1-24530-04",
"System.Linq": "4.3.0-preview1-24530-04",
"System.Net.Http": "4.3.0-preview1-24530-04",
"System.Net.Sockets": "4.3.0-preview1-24530-04",
"System.Private.ServiceModel": "4.3.0-preview1-24530-01",
"System.ServiceModel.Duplex": "4.3.0-preview1-24530-01",
"System.ServiceModel.Http": "4.3.0-preview1-24530-01",
"System.ServiceModel.NetTcp": "4.3.0-preview1-24530-01",
"System.ServiceModel.Primitives": "4.3.0-preview1-24530-01",
"System.ServiceModel.Security": "4.3.0-preview1-24530-01",
"System.Threading": "4.3.0-preview1-24530-03",
"System.Threading": "4.3.0-preview1-24530-04",
"test-runtime": {
"target": "project",
"exclude": "compile"
Expand Down
2 changes: 1 addition & 1 deletion src/System.ServiceModel.Duplex/src/netcore50/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcore50": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/System.ServiceModel.Http/src/netcore50/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcore50": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/System.ServiceModel.NetTcp/src/netcore50/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcore50": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcore50": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcore50": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
}
}
},
Expand Down

0 comments on commit eb2eee8

Please sign in to comment.