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

Commit 4cda5aa

Browse files
mellinoemellinoe
committed
Merge pull request #2609 from mellinoe/latest-xunit
Latest xUnit beta for all test projects
2 parents b2efe9e + e10a301 commit 4cda5aa

File tree

279 files changed

+33797
-21925
lines changed

Some content is hidden

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

279 files changed

+33797
-21925
lines changed

‎dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!-- Build Tools Versions -->
1212
<PropertyGroup>
13-
<BuildToolsVersion>1.0.25-prerelease-00066</BuildToolsVersion>
13+
<BuildToolsVersion>1.0.25-prerelease-00069</BuildToolsVersion>
1414
<DnxVersion>1.0.0-beta5-12101</DnxVersion>
1515
<DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
1616
<DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>

‎src/.nuget/packages.Unix.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00066" />
3+
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00069" />
44
<package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
55
<package id="dnx-mono" version="1.0.0-beta5-12101" />
66
<package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" />

‎src/.nuget/packages.Windows_NT.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00066" />
3+
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00069" />
44
<package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
55
<package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
66
</packages>

‎src/Common/tests/System/Diagnostics/AssertWithCallerAttributes.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,21 +277,21 @@ public static T IsType<T>(object @object,
277277
public static void None(IEnumerable collection, object expected,
278278
[CallerFilePath] string path = null, [CallerLineNumber] int line = 0)
279279
{
280-
try { Xunit.Assert.None(collection, expected); }
280+
try { Xunit.Assert.DoesNotContain(expected, (IEnumerable<object>)collection); }
281281
catch (Exception e) { throw WrapException(e, path, line); }
282282
}
283283

284-
public static void None<T>(IEnumerable<T> collection, Func<T, bool> predicate,
284+
public static void None<T>(IEnumerable<T> collection, Predicate<T> predicate,
285285
[CallerFilePath] string path = null, [CallerLineNumber] int line = 0)
286286
{
287-
try { Xunit.Assert.None(collection, predicate); }
287+
try { Xunit.Assert.DoesNotContain(collection, predicate); }
288288
catch (Exception e) { throw WrapException(e, path, line); }
289289
}
290290

291291
public static void None<T>(IEnumerable<T> collection, T expected,
292292
[CallerFilePath] string path = null, [CallerLineNumber] int line = 0)
293293
{
294-
try { Xunit.Assert.None(collection, expected); }
294+
try { Xunit.Assert.DoesNotContain(expected, collection); }
295295
catch (Exception e) { throw WrapException(e, path, line); }
296296
}
297297

‎src/Common/tests/project.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
"System.Threading.Overlapped": "4.0.0",
1818
"System.Threading.Tasks": "4.0.10",
1919
"System.Threading.ThreadPool": "4.0.10-beta-*",
20-
"xunit": "2.0.0-beta5-build2785",
21-
"xunit.abstractions.netcore": "1.0.0-prerelease",
22-
"xunit.assert": "2.0.0-beta5-build2785",
23-
"xunit.core.netcore": "1.0.1-prerelease",
20+
"xunit": "2.1.0-beta3-*",
2421
"xunit.netcore.extensions": "1.0.0-prerelease-*"
2522
},
2623
"frameworks": {

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

Lines changed: 153 additions & 129 deletions
Large diffs are not rendered by default.

‎src/Microsoft.Win32.Primitives/tests/project.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
22
"dependencies": {
3+
"System.Globalization": "4.0.10",
34
"System.Runtime": "4.0.20",
45
"System.Runtime.InteropServices": "4.0.20",
5-
"xunit": "2.0.0-beta5-build2785",
6-
"xunit.abstractions.netcore": "1.0.0-prerelease",
7-
"xunit.assert": "2.0.0-beta5-build2785",
8-
"xunit.core.netcore": "1.0.1-prerelease",
6+
"xunit": "2.1.0-beta3-*",
97
"xunit.netcore.extensions": "1.0.0-prerelease-*"
108
},
119
"frameworks": {

0 commit comments

Comments
 (0)