Skip to content

Commit eb2eee8

Browse files
StephenBonikowskyStephenBonikowsky
authored
Merge pull request #1588 from StephenBonikowsky/UpdateToCoreFx24530-04
Updating CoreFx dependency to version preview1-24530-04
2 parents ce42eb1 + faf73d0 commit eb2eee8

File tree

11 files changed

+35
-35
lines changed

11 files changed

+35
-35
lines changed

‎dependencies.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
33
<PropertyGroup>
4-
<CoreFxCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</CoreFxCurrentRef>
5-
<CoreClrCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</CoreClrCurrentRef>
6-
<WcfCurrentRef>26ddf2989938504c5bcd0d0252e8b4f5f702d827</WcfCurrentRef>
4+
<CoreFxCurrentRef>2a585e9694f0087d39f3d508088245988a7179a6</CoreFxCurrentRef>
5+
<CoreClrCurrentRef>20282ecca31a2a9d8eba8ca4a01e79e7a8458d1d</CoreClrCurrentRef>
6+
<WcfCurrentRef>2a585e9694f0087d39f3d508088245988a7179a6</WcfCurrentRef>
77
</PropertyGroup>
88

99
<!-- Auto-upgraded properties for each build info dependency. -->
1010
<PropertyGroup>
11-
<CoreFxExpectedPrerelease>preview1-24530-03</CoreFxExpectedPrerelease>
11+
<CoreFxExpectedPrerelease>preview1-24530-04</CoreFxExpectedPrerelease>
1212
</PropertyGroup>
1313

1414
<!-- Package dependency verification/auto-upgrade configuration. -->

‎pkg/baseline/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.Private.PackageBaseline": "1.0.1-preview1-24530-03"
3+
"Microsoft.Private.PackageBaseline": "1.0.1-preview1-24530-04"
44
},
55
"frameworks": {
66
"netstandard1.0": {}

‎src/Common/test-runtime/project.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-03",
4-
"Microsoft.NETCore.Targets": "1.1.0-preview1-24530-03",
5-
"Microsoft.NETCore.TestHost": "1.1.0-preview1-24529-02",
6-
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-preview1-24529-02",
7-
"System.Diagnostics.Contracts": "4.3.0-preview1-24530-03",
8-
"System.IO.Compression": "4.3.0-preview1-24530-03",
9-
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0-preview1-24530-03",
10-
"System.Linq.Parallel": "4.3.0-preview1-24530-03",
11-
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
3+
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-04",
4+
"Microsoft.NETCore.Targets": "1.1.0-preview1-24530-04",
5+
"Microsoft.NETCore.TestHost": "1.1.0-preview1-24608-01",
6+
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-preview1-24608-01",
7+
"System.Diagnostics.Contracts": "4.3.0-preview1-24530-04",
8+
"System.IO.Compression": "4.3.0-preview1-24530-04",
9+
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0-preview1-24530-04",
10+
"System.Linq.Parallel": "4.3.0-preview1-24530-04",
11+
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
1212
"coveralls.io": "1.4",
1313
"OpenCover": "4.6.519",
1414
"ReportGenerator": "2.4.3",
@@ -18,14 +18,14 @@
1818
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
1919
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03",
2020
"xunit.console.netcore": "1.0.3-prerelease-00704-04",
21-
"System.Net.Security": "4.3.0-preview1-24530-03"
21+
"System.Net.Security": "4.3.0-preview1-24530-04"
2222
},
2323
"frameworks": {
2424
"netstandard1.3": {},
2525
"uap10.0": {
2626
"dependencies": {
2727
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.1-beta-000547-00",
28-
"System.Console": "4.3.0-preview1-24530-03",
28+
"System.Console": "4.3.0-preview1-24530-04",
2929
"microsoft.xunit.runner.uwp": "1.0.3-prerelease-00614-01",
3030
"Microsoft.DotNet.TestILC": {
3131
"version": "1.4.24208-prerelease",

‎src/System.Private.ServiceModel/src/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"System.Net.Primitives": "4.0.10",
2222
"System.Net.WebHeaderCollection": "4.0.0",
2323
"System.Net.WebSockets": "4.0.0",
24-
"System.Net.WebSockets.Client": "4.3.0-preview1-24530-03",
24+
"System.Net.WebSockets.Client": "4.3.0-preview1-24530-04",
2525
"System.ObjectModel": "4.0.0",
2626
"System.Reflection": "4.0.10",
2727
"System.Reflection.DispatchProxy": "4.0.0",
@@ -36,7 +36,7 @@
3636
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
3737
"System.Runtime.Serialization.Xml": "4.1.0",
3838
"System.Security.Claims": "4.0.0",
39-
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
39+
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
4040
"System.Security.Principal": "4.0.0",
4141
"System.Text.Encoding": "4.0.10",
4242
"System.Text.Encoding.Extensions": "4.0.10",
@@ -55,7 +55,7 @@
5555
],
5656
"dependencies": {
5757
"System.Net.NameResolution": "4.0.0",
58-
"System.Net.Security": "4.3.0-preview1-24530-03",
58+
"System.Net.Security": "4.3.0-preview1-24530-04",
5959
"System.Net.Sockets": "4.1.0",
6060
"System.Security.Principal.Windows": "4.0.0"
6161
}

‎src/System.Private.ServiceModel/src/windows/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
3636
"System.Runtime.Serialization.Xml": "4.1.0",
3737
"System.Security.Claims": "4.0.0",
38-
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-03",
38+
"System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04",
3939
"System.Security.Principal": "4.0.0",
4040
"System.Text.Encoding": "4.0.10",
4141
"System.Text.Encoding.Extensions": "4.0.10",

‎src/System.Private.ServiceModel/tests/Stress/SharedPoolsOfWCFObjects/project.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-03",
4-
"System.Collections": "4.3.0-preview1-24530-03",
5-
"System.Collections.Specialized": "4.3.0-preview1-24530-03",
6-
"System.Console": "4.3.0-preview1-24530-03",
7-
"System.Diagnostics.Debug": "4.3.0-preview1-24530-03",
8-
"System.Diagnostics.Tools": "4.3.0-preview1-24530-03",
9-
"System.Linq": "4.3.0-preview1-24530-03",
10-
"System.Net.Http": "4.3.0-preview1-24530-03",
11-
"System.Net.Sockets": "4.3.0-preview1-24530-03",
3+
"Microsoft.NETCore.Platforms": "1.1.0-preview1-24530-04",
4+
"System.Collections": "4.3.0-preview1-24530-04",
5+
"System.Collections.Specialized": "4.3.0-preview1-24530-04",
6+
"System.Console": "4.3.0-preview1-24530-04",
7+
"System.Diagnostics.Debug": "4.3.0-preview1-24530-04",
8+
"System.Diagnostics.Tools": "4.3.0-preview1-24530-04",
9+
"System.Linq": "4.3.0-preview1-24530-04",
10+
"System.Net.Http": "4.3.0-preview1-24530-04",
11+
"System.Net.Sockets": "4.3.0-preview1-24530-04",
1212
"System.Private.ServiceModel": "4.3.0-preview1-24530-01",
1313
"System.ServiceModel.Duplex": "4.3.0-preview1-24530-01",
1414
"System.ServiceModel.Http": "4.3.0-preview1-24530-01",
1515
"System.ServiceModel.NetTcp": "4.3.0-preview1-24530-01",
1616
"System.ServiceModel.Primitives": "4.3.0-preview1-24530-01",
1717
"System.ServiceModel.Security": "4.3.0-preview1-24530-01",
18-
"System.Threading": "4.3.0-preview1-24530-03",
18+
"System.Threading": "4.3.0-preview1-24530-04",
1919
"test-runtime": {
2020
"target": "project",
2121
"exclude": "compile"

‎src/System.ServiceModel.Duplex/src/netcore50/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"netcore50": {
44
"dependencies": {
55
"Microsoft.NETCore.Platforms": "1.0.1",
6-
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
6+
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
77
}
88
}
99
},

‎src/System.ServiceModel.Http/src/netcore50/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"netcore50": {
44
"dependencies": {
55
"Microsoft.NETCore.Platforms": "1.0.1",
6-
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
6+
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
77
}
88
}
99
},

‎src/System.ServiceModel.NetTcp/src/netcore50/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"netcore50": {
44
"dependencies": {
55
"Microsoft.NETCore.Platforms": "1.0.1",
6-
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
6+
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
77
}
88
}
99
},

‎src/System.ServiceModel.Primitives/src/netcore50/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"netcore50": {
44
"dependencies": {
55
"Microsoft.NETCore.Platforms": "1.0.1",
6-
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24529-02"
6+
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-preview1-24608-01"
77
}
88
}
99
},

0 commit comments

Comments
 (0)