diff options
author | Yash Tibrewal <yashkt@google.com> | 2018-12-18 11:40:52 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2018-12-18 11:40:52 -0800 |
commit | bb303513dce4e78d898035b9f7f5ae11b7b452dd (patch) | |
tree | 708cacfd6a93bdfff3fa76e813afe909f3e62fe6 /src/csharp/Grpc.Tools.Tests | |
parent | 00c9c40004d011f01c72d253a530edb3364992bf (diff) | |
parent | d198607457a6f5d47e8c134277ebfe3706f9476b (diff) |
Merge master
Diffstat (limited to 'src/csharp/Grpc.Tools.Tests')
-rw-r--r-- | src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj | 2 | ||||
-rw-r--r-- | src/csharp/Grpc.Tools.Tests/NUnitMain.cs | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj b/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj index a2d4874eec..cfb40f44ae 100644 --- a/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj +++ b/src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj @@ -3,7 +3,7 @@ <Import Project="..\Grpc.Core\Version.csproj.include" /> <PropertyGroup> - <TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks> + <TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks> <OutputType>Exe</OutputType> </PropertyGroup> diff --git a/src/csharp/Grpc.Tools.Tests/NUnitMain.cs b/src/csharp/Grpc.Tools.Tests/NUnitMain.cs index 418c33820e..d30d608aa3 100644 --- a/src/csharp/Grpc.Tools.Tests/NUnitMain.cs +++ b/src/csharp/Grpc.Tools.Tests/NUnitMain.cs @@ -24,10 +24,6 @@ namespace Grpc.Tools.Tests static class NUnitMain { public static int Main(string[] args) => -#if NETCOREAPP1_0 || NETCOREAPP1_1 new AutoRun(typeof(NUnitMain).GetTypeInfo().Assembly).Execute(args); -#else - new AutoRun().Execute(args); -#endif }; } |