Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 4e87b31

Browse files
wtgodbewtgodbe
authored
Merge pull request #6479 from dagood/update-dependencies
Using full versions, update CoreFX dependencies to beta-24326-03
2 parents d92493a + 339823a commit 4e87b31

File tree

588 files changed

+18686
-16304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

588 files changed

+18686
-16304
lines changed

‎global.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"projects": [ "./tests/src", "./tests/src/Common" ]
3+
}

‎tests/dir.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<!--
44
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
@@ -43,7 +43,7 @@
4343
<ValidatePackageVersions>true</ValidatePackageVersions>
4444
<ProhibitFloatingDependencies>true</ProhibitFloatingDependencies>
4545

46-
<CoreFxExpectedPrerelease>rc3-24117-00</CoreFxExpectedPrerelease>
46+
<CoreFxExpectedPrerelease>beta-24328-05</CoreFxExpectedPrerelease>
4747
<CoreClrPackageVersion>1.0.4-beta-24325-02</CoreClrPackageVersion>
4848

4949
<CoreFxVersionsIdentityRegex>^(?i)((System\..*)|(Microsoft\.CSharp)|(Microsoft\.NETCore.*)|(Microsoft\.Win32\..*)|(Microsoft\.VisualBasic))(?&lt;!TestData)$</CoreFxVersionsIdentityRegex>

‎tests/publishdependency.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
55
<ItemGroup>
6-
<TestTargetFramework Include="DNXCore,Version=v5.0">
7-
<Folder>dnxcore50</Folder>
6+
<TestTargetFramework Include=".NETCoreApp,Version=v1.0">
7+
<Folder>netcoreapp1.0</Folder>
88
</TestTargetFramework>
99
</ItemGroup>
1010

‎tests/src/Common/CoreCLRTestLibrary/project.json‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
4-
"System.Collections": "4.0.10",
5-
"System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
6-
"System.Collections.Specialized": "4.0.1-rc3-24117-00",
7-
"System.ComponentModel": "4.0.1-rc3-24117-00",
8-
"System.Console": "4.0.0-rc3-24117-00",
9-
"System.Diagnostics.Process": "4.1.0-rc3-24117-00",
10-
"System.Globalization": "4.0.10",
11-
"System.Globalization.Calendars": "4.0.0",
12-
"System.IO": "4.0.10",
13-
"System.IO.FileSystem": "4.0.1-rc3-24117-00",
14-
"System.IO.FileSystem.Primitives": "4.0.0",
15-
"System.Linq": "4.1.0-rc3-24117-00",
16-
"System.Linq.Queryable": "4.0.1-rc3-24117-00",
17-
"System.Reflection": "4.1.0-rc3-24117-00",
18-
"System.Reflection.Primitives": "4.0.0",
19-
"System.Runtime": "4.1.0-rc3-24117-00",
20-
"System.Runtime.Extensions": "4.0.10",
21-
"System.Runtime.Handles": "4.0.0",
22-
"System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
23-
"System.Runtime.Loader": "4.0.0-rc3-24117-00",
24-
"System.Text.Encoding": "4.0.10",
25-
"System.Threading": "4.0.10",
26-
"System.Threading.Thread": "4.0.0-rc3-24117-00",
27-
"System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
28-
"System.Xml.XDocument": "4.0.11-rc3-24117-00",
29-
"System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
30-
"System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
3+
"Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
4+
"System.Collections": "4.0.12-beta-24328-05",
5+
"System.Collections.NonGeneric": "4.0.2-beta-24328-05",
6+
"System.Collections.Specialized": "4.0.2-beta-24328-05",
7+
"System.ComponentModel": "4.0.2-beta-24328-05",
8+
"System.Console": "4.0.1-beta-24328-05",
9+
"System.Diagnostics.Process": "4.1.1-beta-24328-05",
10+
"System.Globalization": "4.0.12-beta-24328-05",
11+
"System.Globalization.Calendars": "4.0.2-beta-24328-05",
12+
"System.IO": "4.1.1-beta-24328-05",
13+
"System.IO.FileSystem": "4.0.2-beta-24328-05",
14+
"System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
15+
"System.Linq": "4.1.1-beta-24328-05",
16+
"System.Linq.Queryable": "4.0.2-beta-24328-05",
17+
"System.Reflection": "4.1.1-beta-24328-05",
18+
"System.Reflection.Primitives": "4.0.2-beta-24328-05",
19+
"System.Runtime": "4.1.1-beta-24328-05",
20+
"System.Runtime.Extensions": "4.1.1-beta-24328-05",
21+
"System.Runtime.Handles": "4.0.2-beta-24328-05",
22+
"System.Runtime.InteropServices": "4.2.0-beta-24328-05",
23+
"System.Runtime.Loader": "4.0.1-beta-24328-05",
24+
"System.Text.Encoding": "4.0.12-beta-24328-05",
25+
"System.Threading": "4.0.12-beta-24328-05",
26+
"System.Threading.Thread": "4.0.1-beta-24328-05",
27+
"System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
28+
"System.Xml.XDocument": "4.0.12-beta-24328-05",
29+
"System.Xml.XmlDocument": "4.0.2-beta-24328-05",
30+
"System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
31+
"test_runtime": {
32+
"target": "project",
33+
"exclude": "compile"
34+
}
3135
},
3236
"frameworks": {
33-
"dnxcore50": {}
37+
"netcoreapp1.0": {}
3438
},
3539
"runtimes": {
3640
"win7-x86": {},

‎tests/src/Common/Coreclr.TestWrapper/project.json‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
4-
"System.Collections": "4.0.10",
5-
"System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
6-
"System.Collections.Specialized": "4.0.1-rc3-24117-00",
7-
"System.ComponentModel": "4.0.1-rc3-24117-00",
8-
"System.Console": "4.0.0-rc3-24117-00",
9-
"System.Diagnostics.Process": "4.1.0-rc3-24117-00",
10-
"System.Globalization": "4.0.10",
11-
"System.Globalization.Calendars": "4.0.0",
12-
"System.IO": "4.0.10",
13-
"System.IO.FileSystem": "4.0.1-rc3-24117-00",
14-
"System.IO.FileSystem.Primitives": "4.0.0",
15-
"System.Linq": "4.1.0-rc3-24117-00",
16-
"System.Linq.Queryable": "4.0.1-rc3-24117-00",
17-
"System.Reflection": "4.1.0-rc3-24117-00",
18-
"System.Reflection.Primitives": "4.0.0",
19-
"System.Runtime": "4.1.0-rc3-24117-00",
20-
"System.Runtime.Extensions": "4.0.10",
21-
"System.Runtime.Handles": "4.0.0",
22-
"System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
23-
"System.Runtime.Loader": "4.0.0-rc3-24117-00",
24-
"System.Text.Encoding": "4.0.10",
25-
"System.Threading": "4.0.10",
26-
"System.Threading.Tasks": "4.0.10",
27-
"System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
28-
"System.Xml.XDocument": "4.0.11-rc3-24117-00",
29-
"System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
30-
"System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
3+
"Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
4+
"System.Collections": "4.0.12-beta-24328-05",
5+
"System.Collections.NonGeneric": "4.0.2-beta-24328-05",
6+
"System.Collections.Specialized": "4.0.2-beta-24328-05",
7+
"System.ComponentModel": "4.0.2-beta-24328-05",
8+
"System.Console": "4.0.1-beta-24328-05",
9+
"System.Diagnostics.Process": "4.1.1-beta-24328-05",
10+
"System.Globalization": "4.0.12-beta-24328-05",
11+
"System.Globalization.Calendars": "4.0.2-beta-24328-05",
12+
"System.IO": "4.1.1-beta-24328-05",
13+
"System.IO.FileSystem": "4.0.2-beta-24328-05",
14+
"System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
15+
"System.Linq": "4.1.1-beta-24328-05",
16+
"System.Linq.Queryable": "4.0.2-beta-24328-05",
17+
"System.Reflection": "4.1.1-beta-24328-05",
18+
"System.Reflection.Primitives": "4.0.2-beta-24328-05",
19+
"System.Runtime": "4.1.1-beta-24328-05",
20+
"System.Runtime.Extensions": "4.1.1-beta-24328-05",
21+
"System.Runtime.Handles": "4.0.2-beta-24328-05",
22+
"System.Runtime.InteropServices": "4.2.0-beta-24328-05",
23+
"System.Runtime.Loader": "4.0.1-beta-24328-05",
24+
"System.Text.Encoding": "4.0.12-beta-24328-05",
25+
"System.Threading": "4.0.12-beta-24328-05",
26+
"System.Threading.Tasks": "4.0.12-beta-24328-05",
27+
"System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
28+
"System.Xml.XDocument": "4.0.12-beta-24328-05",
29+
"System.Xml.XmlDocument": "4.0.2-beta-24328-05",
30+
"System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
31+
"test_runtime": {
32+
"target": "project",
33+
"exclude": "compile"
34+
}
3135
},
3236
"frameworks": {
33-
"dnxcore50": {}
37+
"netcoreapp1.0": {}
3438
},
3539
"runtimes": {
3640
"win7-x86": {},

‎tests/src/Common/test_runtime/project.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"dependencies": {
3+
"Microsoft.NETCore.Targets": "1.0.3-beta-24328-05",
4+
"System.Collections.Concurrent": "4.0.13-beta-24328-05",
5+
"System.Collections.Immutable": "1.2.1-beta-24328-05",
6+
"System.Diagnostics.Tracing": "4.1.1-beta-24328-05",
7+
"System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
8+
"System.Linq": "4.1.1-beta-24328-05",
9+
"System.Linq.Expressions": "4.1.1-beta-24328-05",
10+
"System.ObjectModel": "4.0.13-beta-24328-05",
11+
"System.Reflection.Emit.Lightweight": "4.0.2-beta-24328-05",
12+
"System.Reflection.TypeExtensions": "4.1.1-beta-24328-05",
13+
"System.Runtime.Numerics": "4.0.2-beta-24328-05",
14+
"System.Text.RegularExpressions": "4.2.0-beta-24328-05",
15+
"System.Threading": "4.0.12-beta-24328-05",
16+
"System.Threading.Overlapped": "4.0.2-beta-24328-05",
17+
"System.Threading.Thread": "4.0.1-beta-24328-05",
18+
"System.Threading.ThreadPool": "4.0.11-beta-24328-05",
19+
"System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
20+
"System.Xml.XDocument": "4.0.12-beta-24328-05",
21+
"System.Xml.XmlDocument": "4.0.2-beta-24328-05",
22+
"System.Xml.XmlSerializer": "4.0.12-beta-24328-05"
23+
},
24+
"frameworks": {
25+
"netcoreapp1.0": {}
26+
}
27+
}

‎tests/src/CoreMangLib/components/fileversioninfo/project.json‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
4-
"System.Collections": "4.0.10",
5-
"System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
6-
"System.Collections.Specialized": "4.0.1-rc3-24117-00",
7-
"System.ComponentModel": "4.0.1-rc3-24117-00",
8-
"System.Console": "4.0.0-rc3-24117-00",
9-
"System.Diagnostics.Process": "4.1.0-rc3-24117-00",
10-
"System.Globalization": "4.0.10",
11-
"System.Globalization.Calendars": "4.0.0",
12-
"System.IO": "4.0.10",
13-
"System.IO.FileSystem": "4.0.1-rc3-24117-00",
14-
"System.IO.FileSystem.Primitives": "4.0.0",
15-
"System.Linq": "4.1.0-rc3-24117-00",
16-
"System.Linq.Queryable": "4.0.1-rc3-24117-00",
17-
"System.Reflection": "4.1.0-rc3-24117-00",
18-
"System.Reflection.Primitives": "4.0.0",
19-
"System.Runtime": "4.1.0-rc3-24117-00",
20-
"System.Runtime.Extensions": "4.0.10",
21-
"System.Runtime.Handles": "4.0.0",
22-
"System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
23-
"System.Runtime.Loader": "4.0.0-rc3-24117-00",
24-
"System.Text.Encoding": "4.0.10",
25-
"System.Threading": "4.0.10",
26-
"System.Threading.Thread": "4.0.0-rc3-24117-00",
27-
"System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
28-
"System.Xml.XDocument": "4.0.11-rc3-24117-00",
29-
"System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
30-
"System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
3+
"Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
4+
"System.Collections": "4.0.12-beta-24328-05",
5+
"System.Collections.NonGeneric": "4.0.2-beta-24328-05",
6+
"System.Collections.Specialized": "4.0.2-beta-24328-05",
7+
"System.ComponentModel": "4.0.2-beta-24328-05",
8+
"System.Console": "4.0.1-beta-24328-05",
9+
"System.Diagnostics.Process": "4.1.1-beta-24328-05",
10+
"System.Globalization": "4.0.12-beta-24328-05",
11+
"System.Globalization.Calendars": "4.0.2-beta-24328-05",
12+
"System.IO": "4.1.1-beta-24328-05",
13+
"System.IO.FileSystem": "4.0.2-beta-24328-05",
14+
"System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
15+
"System.Linq": "4.1.1-beta-24328-05",
16+
"System.Linq.Queryable": "4.0.2-beta-24328-05",
17+
"System.Reflection": "4.1.1-beta-24328-05",
18+
"System.Reflection.Primitives": "4.0.2-beta-24328-05",
19+
"System.Runtime": "4.1.1-beta-24328-05",
20+
"System.Runtime.Extensions": "4.1.1-beta-24328-05",
21+
"System.Runtime.Handles": "4.0.2-beta-24328-05",
22+
"System.Runtime.InteropServices": "4.2.0-beta-24328-05",
23+
"System.Runtime.Loader": "4.0.1-beta-24328-05",
24+
"System.Text.Encoding": "4.0.12-beta-24328-05",
25+
"System.Threading": "4.0.12-beta-24328-05",
26+
"System.Threading.Thread": "4.0.1-beta-24328-05",
27+
"System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
28+
"System.Xml.XDocument": "4.0.12-beta-24328-05",
29+
"System.Xml.XmlDocument": "4.0.2-beta-24328-05",
30+
"System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
31+
"test_runtime": {
32+
"target": "project",
33+
"exclude": "compile"
34+
}
3135
},
3236
"frameworks": {
33-
"dnxcore50": {}
37+
"netcoreapp1.0": {}
3438
},
3539
"runtimes": {
3640
"win7-x86": {},

‎tests/src/CoreMangLib/components/stopwatch/project.json‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
4-
"System.Collections": "4.0.10",
5-
"System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
6-
"System.Collections.Specialized": "4.0.1-rc3-24117-00",
7-
"System.ComponentModel": "4.0.1-rc3-24117-00",
8-
"System.Console": "4.0.0-rc3-24117-00",
9-
"System.Diagnostics.Process": "4.1.0-rc3-24117-00",
10-
"System.Globalization": "4.0.10",
11-
"System.Globalization.Calendars": "4.0.0",
12-
"System.IO": "4.0.10",
13-
"System.IO.FileSystem": "4.0.1-rc3-24117-00",
14-
"System.IO.FileSystem.Primitives": "4.0.0",
15-
"System.Linq": "4.1.0-rc3-24117-00",
16-
"System.Linq.Queryable": "4.0.1-rc3-24117-00",
17-
"System.Reflection": "4.1.0-rc3-24117-00",
18-
"System.Reflection.Primitives": "4.0.0",
19-
"System.Runtime": "4.1.0-rc3-24117-00",
20-
"System.Runtime.Extensions": "4.0.10",
21-
"System.Runtime.Handles": "4.0.0",
22-
"System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
23-
"System.Runtime.Loader": "4.0.0-rc3-24117-00",
24-
"System.Text.Encoding": "4.0.10",
25-
"System.Threading": "4.0.10",
26-
"System.Threading.Thread": "4.0.0-rc3-24117-00",
27-
"System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
28-
"System.Xml.XDocument": "4.0.11-rc3-24117-00",
29-
"System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
30-
"System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
3+
"Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
4+
"System.Collections": "4.0.12-beta-24328-05",
5+
"System.Collections.NonGeneric": "4.0.2-beta-24328-05",
6+
"System.Collections.Specialized": "4.0.2-beta-24328-05",
7+
"System.ComponentModel": "4.0.2-beta-24328-05",
8+
"System.Console": "4.0.1-beta-24328-05",
9+
"System.Diagnostics.Process": "4.1.1-beta-24328-05",
10+
"System.Globalization": "4.0.12-beta-24328-05",
11+
"System.Globalization.Calendars": "4.0.2-beta-24328-05",
12+
"System.IO": "4.1.1-beta-24328-05",
13+
"System.IO.FileSystem": "4.0.2-beta-24328-05",
14+
"System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
15+
"System.Linq": "4.1.1-beta-24328-05",
16+
"System.Linq.Queryable": "4.0.2-beta-24328-05",
17+
"System.Reflection": "4.1.1-beta-24328-05",
18+
"System.Reflection.Primitives": "4.0.2-beta-24328-05",
19+
"System.Runtime": "4.1.1-beta-24328-05",
20+
"System.Runtime.Extensions": "4.1.1-beta-24328-05",
21+
"System.Runtime.Handles": "4.0.2-beta-24328-05",
22+
"System.Runtime.InteropServices": "4.2.0-beta-24328-05",
23+
"System.Runtime.Loader": "4.0.1-beta-24328-05",
24+
"System.Text.Encoding": "4.0.12-beta-24328-05",
25+
"System.Threading": "4.0.12-beta-24328-05",
26+
"System.Threading.Thread": "4.0.1-beta-24328-05",
27+
"System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
28+
"System.Xml.XDocument": "4.0.12-beta-24328-05",
29+
"System.Xml.XmlDocument": "4.0.2-beta-24328-05",
30+
"System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
31+
"test_runtime": {
32+
"target": "project",
33+
"exclude": "compile"
34+
}
3135
},
3236
"frameworks": {
33-
"dnxcore50": {}
37+
"netcoreapp1.0": {}
3438
},
3539
"runtimes": {
3640
"win7-x86": {},

0 commit comments

Comments
 (0)