From e823897005b88b03088fe17d219ffaeeabb2961d Mon Sep 17 00:00:00 2001
From: ObsidianMinor <obsidianminor@gmail.com>
Date: Tue, 6 Feb 2018 12:59:20 -0600
Subject: [PATCH 1/4] Updated NUnit packages, removed NUnitLite added packages
 for dotnet and Visual Studio, changed dotnet command in buildall to dotnet
 test, and deleted Program.cs (because it's no longer required).

---
 csharp/buildall.sh                            |  2 +-
 .../Google.Protobuf.Test.csproj               |  8 ++--
 csharp/src/Google.Protobuf.Test/Program.cs    | 48 -------------------
 3 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100755 csharp/src/Google.Protobuf.Test/Program.cs

diff --git a/csharp/buildall.sh b/csharp/buildall.sh
index dd4b463dd..50d8906dc 100755
--- a/csharp/buildall.sh
+++ b/csharp/buildall.sh
@@ -14,4 +14,4 @@ echo Running tests.
 # If we want to test the .NET 4.5 version separately, we could
 # run Mono explicitly. However, we don't have any differences between
 # the .NET 4.5 and netstandard1.0 assemblies.
-dotnet run -c $CONFIG -f netcoreapp1.0 -p $SRC/Google.Protobuf.Test/Google.Protobuf.Test.csproj
+dotnet test -c $CONFIG -f netcoreapp1.0 $SRC/Google.Protobuf.Test/Google.Protobuf.Test.csproj
diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
index 06d07b9f4..6a430116b 100644
--- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
+++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -14,8 +13,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
-    <PackageReference Include="NUnitLite" Version="3.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
   </ItemGroup>
 
   <!-- 
@@ -26,5 +26,5 @@
   <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
     <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
   </PropertyGroup>
-  
+
 </Project>
diff --git a/csharp/src/Google.Protobuf.Test/Program.cs b/csharp/src/Google.Protobuf.Test/Program.cs
deleted file mode 100755
index 954c02b5a..000000000
--- a/csharp/src/Google.Protobuf.Test/Program.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnitLite;
-using System.Reflection;
-
-namespace Google.Protobuf.Test
-{
-    class Program
-    {
-        public static int Main(string[] args)
-        {
-            #if NET35
-                return new AutoRun(typeof(Program).Assembly).Execute(args);
-            #else
-                return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-            #endif
-        }
-    }
-}
\ No newline at end of file

From a731ecb4718872bccda4d7870ab7709bb534eec2 Mon Sep 17 00:00:00 2001
From: ObsidianMinor <obsidianminor@gmail.com>
Date: Tue, 6 Feb 2018 13:13:06 -0600
Subject: [PATCH 2/4] Adjusted appveyor batch

---
 appveyor.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.bat b/appveyor.bat
index ca88b25c3..e59ebccc2 100644
--- a/appveyor.bat
+++ b/appveyor.bat
@@ -26,8 +26,8 @@ dotnet restore
 dotnet build -c %configuration% || goto error
 
 echo Testing C#
-dotnet run -c %configuration% -f netcoreapp1.0 -p Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
-dotnet run -c %configuration% -f net451 -p Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
+dotnet test -c %configuration% -f netcoreapp1.0 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
+dotnet test -c %configuration% -f net451 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
 
 goto :EOF
 

From 8b2ba9e88767d4ce320cd7cb38f01148d872a7df Mon Sep 17 00:00:00 2001
From: ObsidianMinor <obsidianminor@gmail.com>
Date: Tue, 6 Feb 2018 14:19:17 -0600
Subject: [PATCH 3/4] Remove Google.Protobuf.Test/Program.cs from Makefile.am

---
 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d392429f2..5d30d3146 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,6 @@ csharp_EXTRA_DIST=                                                           \
   csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs                       \
   csharp/src/Google.Protobuf.Test/JsonParserTest.cs                          \
   csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs                       \
-  csharp/src/Google.Protobuf.Test/Program.cs                                 \
   csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs            \
   csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs              \
   csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs              \

From f72ac9f987168cb333a1ca0b6482737f7466b22a Mon Sep 17 00:00:00 2001
From: ObsidianMinor <obsidianminor@gmail.com>
Date: Wed, 4 Apr 2018 16:04:12 -0500
Subject: [PATCH 4/4] Updated csharp/README.md to reflect testing changes

---
 csharp/README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/csharp/README.md b/csharp/README.md
index c1d124194..436248bb1 100644
--- a/csharp/README.md
+++ b/csharp/README.md
@@ -44,10 +44,8 @@ they're only relevant when building the `Google.Protobuf` assembly.
 Testing
 =======
 
-The unit tests use [NUnit 3](https://github.com/nunit/nunit). NUnit doesn't yet
-support `dotnet test`, so for now the test project is a console application 
-using NUnitLite. Simply run `Google.Protobuf.Test.exe` to run the unit tests 
-directly, or else use `dotnet run`.
+The unit tests use [NUnit 3](https://github.com/nunit/nunit). Tests can be
+run using the Visual Studio Test Explorer or `dotnet test`.
 
 .NET 3.5
 ========