From 37301a58d0503496b5479657bb7a2efcfeffbb05 Mon Sep 17 00:00:00 2001 From: Rob Prouse Date: Wed, 2 Dec 2015 17:23:59 -0500 Subject: [PATCH 1/2] Preparing for the 3.0.1 release --- build.cake | 4 ++-- nuget/nunit.runners.xamarin.nuspec | 2 +- nunit.runner.userprefs | 15 ------------ .../nunit.runner.Droid.csproj | 6 ++--- src/runner/nunit.runner.Droid/packages.config | 2 +- .../nunit.runner.iOS/nunit.runner.iOS.csproj | 4 ++-- src/runner/nunit.runner.iOS/packages.config | 2 +- .../nunit.runner.uwp.nuget.targets | 2 +- src/runner/nunit.runner.uwp/project.json | 2 +- src/runner/nunit.runner.uwp/project.lock.json | 24 +++++++++---------- .../nunit.runner.wp81.csproj | 4 ++-- src/runner/nunit.runner.wp81/packages.config | 2 +- .../nunit.runner.tests.Droid.csproj | 6 ++--- .../nunit.runner.tests.Droid/packages.config | 2 +- .../nunit.runner.tests.iOS.csproj | 4 ++-- .../nunit.runner.tests.iOS/packages.config | 2 +- .../nunit.runner.tests.uwp.nuget.targets | 2 +- src/tests/nunit.runner.tests.uwp/project.json | 2 +- .../nunit.runner.tests.uwp/project.lock.json | 24 +++++++++---------- .../nunit.runner.tests.wp81.csproj | 4 ++-- .../nunit.runner.tests.wp81/packages.config | 2 +- 21 files changed, 51 insertions(+), 66 deletions(-) delete mode 100644 nunit.runner.userprefs diff --git a/build.cake b/build.cake index 5af02e8..ecf7ade 100644 --- a/build.cake +++ b/build.cake @@ -17,9 +17,9 @@ var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest; // Versioning -var packageVersion = "3.0.0"; +var packageVersion = "3.0.1"; var packageModifier = ""; -var displayVersion = "3.0.0"; +var displayVersion = "3.0.1"; var semVersion = packageVersion + packageModifier; diff --git a/nuget/nunit.runners.xamarin.nuspec b/nuget/nunit.runners.xamarin.nuspec index c48593e..e4f784d 100644 --- a/nuget/nunit.runners.xamarin.nuspec +++ b/nuget/nunit.runners.xamarin.nuspec @@ -24,7 +24,7 @@ Supported Xamarin platforms: - + diff --git a/nunit.runner.userprefs b/nunit.runner.userprefs deleted file mode 100644 index 3d02813..0000000 --- a/nunit.runner.userprefs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj index 782c87d..28b4503 100644 --- a/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj +++ b/src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj @@ -13,7 +13,7 @@ Resources\Resource.Designer.cs Off True - v5.1 + v6.0 True @@ -45,8 +45,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/runner/nunit.runner.Droid/packages.config b/src/runner/nunit.runner.Droid/packages.config index 772f438..a0e08bc 100644 --- a/src/runner/nunit.runner.Droid/packages.config +++ b/src/runner/nunit.runner.Droid/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj b/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj index 347a8d7..23404ca 100644 --- a/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj +++ b/src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj @@ -39,8 +39,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/runner/nunit.runner.iOS/packages.config b/src/runner/nunit.runner.iOS/packages.config index 2df0229..46f9c1f 100644 --- a/src/runner/nunit.runner.iOS/packages.config +++ b/src/runner/nunit.runner.iOS/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets b/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets index f3ae95b..7091ed7 100644 --- a/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets +++ b/src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets @@ -1,7 +1,7 @@  - C:\Users\Rob\.nuget\packages\ + $(UserProfile)\.nuget\packages\ diff --git a/src/runner/nunit.runner.uwp/project.json b/src/runner/nunit.runner.uwp/project.json index 0f4475f..77db493 100644 --- a/src/runner/nunit.runner.uwp/project.json +++ b/src/runner/nunit.runner.uwp/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", - "NUnit": "3.0.0", + "NUnit": "3.0.1", "Xamarin.Forms": "1.5.0.6447" }, "frameworks": { diff --git a/src/runner/nunit.runner.uwp/project.lock.json b/src/runner/nunit.runner.uwp/project.lock.json index d3cd5d5..e791a7e 100644 --- a/src/runner/nunit.runner.uwp/project.lock.json +++ b/src/runner/nunit.runner.uwp/project.lock.json @@ -201,7 +201,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -1803,7 +1803,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -3438,7 +3438,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -5078,7 +5078,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -6713,7 +6713,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -8353,7 +8353,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -9988,7 +9988,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -12036,8 +12036,8 @@ "ref/xamarinmac20/_._" ] }, - "NUnit/3.0.0": { - "sha512": "/7lqdUb+/e1NAd3NDhY05ppjQUieAamnUxHzhKgaxWVNyTJqhdR0z73MXNc2VV2dignM4MieF3Tzs1wXsWx8/w==", + "NUnit/3.0.1": { + "sha512": "Fhz2Flnzlb+HjVxTK+W3dNAb9FUIbGxUp/G6jTTL487lBxInaDOWigNGzWbj1Ipjb87ix77heBCzrsVhk8+X8w==", "type": "Package", "files": [ "[Content_Types].xml", @@ -12056,7 +12056,7 @@ "LICENSE.txt", "NOTICES.txt", "NUnit.nuspec", - "package/services/metadata/core-properties/45d9d63e089a4fbb8ffafab5905528b3.psmdcp" + "package/services/metadata/core-properties/59ec910f17c54b6493a6276f36784454.psmdcp" ] }, "System.AppContext/4.0.0": { @@ -14755,7 +14755,7 @@ ] }, "Xamarin.Forms/1.5.0.6447": { - "sha512": "0oBfhFmKt4kxFK+iBdTtZaW6Ys/adM7fH/47EcHLXfsNoe34xtYAqEZ7A4lGMnzg/5hgRVHmiOV2Z0cmZvuTwg==", + "sha512": "iPmiog6UF5ZZNyE0faRdWhGlVaoqVRi193wyeStwRxX6l3QNomMFBaHN58ly2vOuKD2KYk+McjBOEQi6HfNwEA==", "type": "Package", "files": [ "[Content_Types].xml", @@ -14837,7 +14837,7 @@ "projectFileDependencyGroups": { "": [ "Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0", - "NUnit >= 3.0.0", + "NUnit >= 3.0.1", "Xamarin.Forms >= 1.5.0.6447" ], "UAP,Version=v10.0": [] diff --git a/src/runner/nunit.runner.wp81/nunit.runner.wp81.csproj b/src/runner/nunit.runner.wp81/nunit.runner.wp81.csproj index de3e203..ee22891 100644 --- a/src/runner/nunit.runner.wp81/nunit.runner.wp81.csproj +++ b/src/runner/nunit.runner.wp81/nunit.runner.wp81.csproj @@ -86,8 +86,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/runner/nunit.runner.wp81/packages.config b/src/runner/nunit.runner.wp81/packages.config index 6fed4c9..97a3218 100644 --- a/src/runner/nunit.runner.wp81/packages.config +++ b/src/runner/nunit.runner.wp81/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj index 7a720ff..cbfd946 100644 --- a/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj +++ b/src/tests/nunit.runner.tests.Droid/nunit.runner.tests.Droid.csproj @@ -24,7 +24,7 @@ True - v5.1 + v6.0 true @@ -53,8 +53,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/tests/nunit.runner.tests.Droid/packages.config b/src/tests/nunit.runner.tests.Droid/packages.config index 1eda403..1af501e 100644 --- a/src/tests/nunit.runner.tests.Droid/packages.config +++ b/src/tests/nunit.runner.tests.Droid/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.csproj b/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.csproj index 5888415..d6ca7a8 100644 --- a/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.csproj +++ b/src/tests/nunit.runner.tests.iOS/nunit.runner.tests.iOS.csproj @@ -116,8 +116,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/tests/nunit.runner.tests.iOS/packages.config b/src/tests/nunit.runner.tests.iOS/packages.config index 2df0229..46f9c1f 100644 --- a/src/tests/nunit.runner.tests.iOS/packages.config +++ b/src/tests/nunit.runner.tests.iOS/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets b/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets index f3ae95b..7091ed7 100644 --- a/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets +++ b/src/tests/nunit.runner.tests.uwp/nunit.runner.tests.uwp.nuget.targets @@ -1,7 +1,7 @@  - C:\Users\Rob\.nuget\packages\ + $(UserProfile)\.nuget\packages\ diff --git a/src/tests/nunit.runner.tests.uwp/project.json b/src/tests/nunit.runner.tests.uwp/project.json index 5a1e975..06aa3f5 100644 --- a/src/tests/nunit.runner.tests.uwp/project.json +++ b/src/tests/nunit.runner.tests.uwp/project.json @@ -4,7 +4,7 @@ "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0", "Microsoft.ApplicationInsights.WindowsApps": "1.0.0", "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", - "NUnit": "3.0.0", + "NUnit": "3.0.1", "Xamarin.Forms": "1.5.0.6447" }, "frameworks": { diff --git a/src/tests/nunit.runner.tests.uwp/project.lock.json b/src/tests/nunit.runner.tests.uwp/project.lock.json index ee289b0..f91d740 100644 --- a/src/tests/nunit.runner.tests.uwp/project.lock.json +++ b/src/tests/nunit.runner.tests.uwp/project.lock.json @@ -232,7 +232,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -1865,7 +1865,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -3531,7 +3531,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -5202,7 +5202,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -6868,7 +6868,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -8539,7 +8539,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -10205,7 +10205,7 @@ "lib/dotnet/Microsoft.Win32.Primitives.dll": {} } }, - "NUnit/3.0.0": { + "NUnit/3.0.1": { "compile": { "lib/dotnet/nunit.framework.dll": {} }, @@ -12303,8 +12303,8 @@ "ref/xamarinmac20/_._" ] }, - "NUnit/3.0.0": { - "sha512": "/7lqdUb+/e1NAd3NDhY05ppjQUieAamnUxHzhKgaxWVNyTJqhdR0z73MXNc2VV2dignM4MieF3Tzs1wXsWx8/w==", + "NUnit/3.0.1": { + "sha512": "Fhz2Flnzlb+HjVxTK+W3dNAb9FUIbGxUp/G6jTTL487lBxInaDOWigNGzWbj1Ipjb87ix77heBCzrsVhk8+X8w==", "type": "Package", "files": [ "[Content_Types].xml", @@ -12323,7 +12323,7 @@ "LICENSE.txt", "NOTICES.txt", "NUnit.nuspec", - "package/services/metadata/core-properties/45d9d63e089a4fbb8ffafab5905528b3.psmdcp" + "package/services/metadata/core-properties/59ec910f17c54b6493a6276f36784454.psmdcp" ] }, "System.AppContext/4.0.0": { @@ -15022,7 +15022,7 @@ ] }, "Xamarin.Forms/1.5.0.6447": { - "sha512": "0oBfhFmKt4kxFK+iBdTtZaW6Ys/adM7fH/47EcHLXfsNoe34xtYAqEZ7A4lGMnzg/5hgRVHmiOV2Z0cmZvuTwg==", + "sha512": "iPmiog6UF5ZZNyE0faRdWhGlVaoqVRi193wyeStwRxX6l3QNomMFBaHN58ly2vOuKD2KYk+McjBOEQi6HfNwEA==", "type": "Package", "files": [ "[Content_Types].xml", @@ -15107,7 +15107,7 @@ "Microsoft.ApplicationInsights.PersistenceChannel >= 1.0.0", "Microsoft.ApplicationInsights.WindowsApps >= 1.0.0", "Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0", - "NUnit >= 3.0.0", + "NUnit >= 3.0.1", "Xamarin.Forms >= 1.5.0.6447" ], "UAP,Version=v10.0": [] diff --git a/src/tests/nunit.runner.tests.wp81/nunit.runner.tests.wp81.csproj b/src/tests/nunit.runner.tests.wp81/nunit.runner.tests.wp81.csproj index ad85dee..f6cf2ee 100644 --- a/src/tests/nunit.runner.tests.wp81/nunit.runner.tests.wp81.csproj +++ b/src/tests/nunit.runner.tests.wp81/nunit.runner.tests.wp81.csproj @@ -113,8 +113,8 @@ - - ..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll + + ..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll True diff --git a/src/tests/nunit.runner.tests.wp81/packages.config b/src/tests/nunit.runner.tests.wp81/packages.config index 6fed4c9..97a3218 100644 --- a/src/tests/nunit.runner.tests.wp81/packages.config +++ b/src/tests/nunit.runner.tests.wp81/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From 8f5b6614590db65b01ba69da26df030601a1a004 Mon Sep 17 00:00:00 2001 From: Rob Prouse Date: Thu, 3 Dec 2015 16:53:04 -0500 Subject: [PATCH 2/2] Added async tests to ensure they are fixed on Win10 UWP --- src/tests/nunit.runner.tests/AsyncTests.cs | 62 +++++++++++++++++++ .../nunit.runner.tests.projitems | 1 + 2 files changed, 63 insertions(+) create mode 100644 src/tests/nunit.runner.tests/AsyncTests.cs diff --git a/src/tests/nunit.runner.tests/AsyncTests.cs b/src/tests/nunit.runner.tests/AsyncTests.cs new file mode 100644 index 0000000..0531954 --- /dev/null +++ b/src/tests/nunit.runner.tests/AsyncTests.cs @@ -0,0 +1,62 @@ +// *********************************************************************** +// Copyright (c) 2015 Charlie Poole +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// *********************************************************************** + +using NUnit.Framework; +using System.Threading.Tasks; + +namespace NUnit.Runner.Tests +{ + [TestFixture] + public class AsyncTests + { + [Test] + public async Task TestAsyncMethodWithoutReturn() + { + await AsyncMethodWithoutReturn(); + Assert.Pass(); + } + + [Test] + public async Task TestAsyncMethodWithReturnValueIndirectly() + { + bool actual = await AsyncMethodWithReturnValue(); + Assert.That(actual, Is.True); + } + + [Test] + public void TestAsyncMethodWithReturnValueDirectly() + { + Assert.That(async () => await AsyncMethodWithReturnValue(), Is.True); + } + + public async Task AsyncMethodWithoutReturn() + { + await Task.FromResult(null); + } + + public async Task AsyncMethodWithReturnValue() + { + return await Task.FromResult(true); + } + } +} diff --git a/src/tests/nunit.runner.tests/nunit.runner.tests.projitems b/src/tests/nunit.runner.tests/nunit.runner.tests.projitems index 20c28ae..821a650 100644 --- a/src/tests/nunit.runner.tests/nunit.runner.tests.projitems +++ b/src/tests/nunit.runner.tests/nunit.runner.tests.projitems @@ -9,6 +9,7 @@ NUnit.Runner.Tests +