зеркало из
1
0
Форкнуть 0

Remove final 3.5 conditions and fix nuget package to exclude it

This commit is contained in:
Charlie Poole 2015-02-24 09:30:49 -08:00
Родитель 7ef8781791
Коммит e86ef6abc6
4 изменённых файлов: 6 добавлений и 9 удалений

Просмотреть файл

@ -12,7 +12,7 @@ compact framework 3.5.
The solutions all place their output in a common bin directory. Console runner and engine
components are placed directly in the bin directory while framework components end up in
subdirectories net-2.0, net-3.5, net4.0, sl-5.0, portable and netcf-3.5. Future platform
subdirectories net-2.0, net4.0, sl-5.0, portable and netcf-3.5. Future platform
builds will cause new subdirectories to be created.
The build shell script and build.cmd script are provided as an easy way to locate and

Просмотреть файл

@ -30,8 +30,6 @@
<file src="CHANGES.txt" />
<file src="$builddir$\net-2.0\nunit.framework.dll" target="lib\net20" />
<file src="$builddir$\net-2.0\nunit.framework.xml" target="lib\net20" />
<file src="$builddir$\net-3.5\nunit.framework.dll" target="lib\net35" />
<file src="$builddir$\net-3.5\nunit.framework.xml" target="lib\net35" />
<file src="$builddir$\net-4.0\nunit.framework.dll" target="lib\net40" />
<file src="$builddir$\net-4.0\nunit.framework.xml" target="lib\net40" />
<file src="$builddir$\net-4.5\nunit.framework.dll" target="lib\net45" />

Просмотреть файл

@ -33,7 +33,6 @@
<file src="NOTICES.txt" />
<file src="CHANGES.txt" />
<file src="$builddir$\net-2.0\nunitlite.dll" target="lib\net20" />
<file src="$builddir$\net-3.5\nunitlite.dll" target="lib\net35" />
<file src="$builddir$\net-4.0\nunitlite.dll" target="lib\net40" />
<file src="$builddir$\net-4.5\nunitlite.dll" target="lib\net45" />
<file src="$builddir$\sl-5.0\nunitlite.dll" target="lib\sl5" />

Просмотреть файл

@ -153,8 +153,8 @@ namespace NUnit.Framework.Constraints
.ApplyTo(set2).IsSuccess);
}
#if NET_3_5 || NET_4_0 || NET_4_5
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5")]
#if NET_4_0 || NET_4_5
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5,Mono-4.5")]
public void WorksWithHashSets()
{
var hash1 = new HashSet<string>(new string[] { "presto", "abracadabra", "hocuspocus" });
@ -163,7 +163,7 @@ namespace NUnit.Framework.Constraints
Assert.That(new CollectionEquivalentConstraint(hash1).ApplyTo(hash2).IsSuccess);
}
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5")]
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5,Mono-4.5")]
public void WorksWithHashSetAndArray()
{
var hash = new HashSet<string>(new string[] { "presto", "abracadabra", "hocuspocus" });
@ -173,7 +173,7 @@ namespace NUnit.Framework.Constraints
Assert.That(constraint.ApplyTo(array).IsSuccess);
}
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5")]
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5,Mono-4.5")]
public void WorksWithArrayAndHashSet()
{
var hash = new HashSet<string>(new string[] { "presto", "abracadabra", "hocuspocus" });
@ -183,7 +183,7 @@ namespace NUnit.Framework.Constraints
Assert.That(constraint.ApplyTo(hash).IsSuccess);
}
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5")]
[Test, Platform("Net-3.5,Mono-3.5,Net-4.0,Mono-4.0,Net-4.5,Mono-4.5")]
public void FailureMessageWithHashSetAndArray()
{
var hash = new HashSet<string>(new string[] { "presto", "abracadabra", "hocuspocus" });