THRIFT-4990 Switch to .NET core 3.0
Client: netstsd
Patch: Jens Geyer
This closes #1909
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj
index ed30c30..c406f17 100644
--- a/test/netstd/Client/Client.csproj
+++ b/test/netstd/Client/Client.csproj
@@ -19,7 +19,7 @@
-->
<PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Client</AssemblyName>
<PackageId>Client</PackageId>
<OutputType>Exe</OutputType>
diff --git a/test/netstd/Client/Program.cs b/test/netstd/Client/Program.cs
index 62933e6..8dbff1a 100644
--- a/test/netstd/Client/Program.cs
+++ b/test/netstd/Client/Program.cs
@@ -47,24 +47,24 @@
switch(firstArg)
{
case "client":
- return TestClient.Execute(subArgs);
- case "performance":
+ Console.WriteLine("The 'client' argument is no longer required.");
+ PrintHelp();
+ return -1;
+ case "--performance-test":
return Tests.PerformanceTests.Execute();
case "--help":
PrintHelp();
return 0;
default:
- Console.WriteLine("Invalid argument: {0}", firstArg);
- PrintHelp();
- return -1;
+ return TestClient.Execute(subArgs);
}
}
private static void PrintHelp()
{
Console.WriteLine("Usage:");
- Console.WriteLine(" Client client [options]");
- Console.WriteLine(" Client performance");
+ Console.WriteLine(" Client [options]");
+ Console.WriteLine(" Client --performance-test");
Console.WriteLine(" Client --help");
Console.WriteLine("");
diff --git a/test/netstd/README.md b/test/netstd/README.md
index ed728d1..8350728 100644
--- a/test/netstd/README.md
+++ b/test/netstd/README.md
@@ -1,12 +1,12 @@
# Apache Thrift net-core-lib tests
-Tests for Thrift client library ported to Microsoft .Net Core
+Tests for Thrift client library ported to Microsoft .NET Core
# Content
- ThriftTest - tests for Thrift library
# Reused components
-- NET Core Standard 1.6 (SDK 2.0.0)
+- NET Core SDK 3.0
# How to build on Windows
- Get Thrift IDL compiler executable, add to some folder and add path to this folder into PATH variable
@@ -15,6 +15,6 @@
- Build with scripts
# How to build on Unix
-- Ensure you have .NET Core 2.0.0 SDK installed or use the Ubuntu Xenial docker image
+- Ensure you have .NET Core 3.0 SDK installed or use the Ubuntu Xenial docker image
- Follow common build practice for Thrift: bootstrap, configure, and make precross
diff --git a/test/netstd/Server/Program.cs b/test/netstd/Server/Program.cs
index 8bfa371..4525ab7 100644
--- a/test/netstd/Server/Program.cs
+++ b/test/netstd/Server/Program.cs
@@ -47,21 +47,21 @@
switch(firstArg)
{
case "server":
- return TestServer.Execute(subArgs);
+ Console.WriteLine("The 'server' argument is no longer required.");
+ PrintHelp();
+ return -1;
case "--help":
PrintHelp();
return 0;
default:
- Console.WriteLine("Invalid argument: {0}", firstArg);
- PrintHelp();
- return -1;
+ return TestServer.Execute(subArgs);
}
}
private static void PrintHelp()
{
Console.WriteLine("Usage:");
- Console.WriteLine(" Server server [options]'");
+ Console.WriteLine(" Server [options]");
Console.WriteLine(" Server --help");
Console.WriteLine("");
diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj
index 44f46c9..4f2463c 100644
--- a/test/netstd/Server/Server.csproj
+++ b/test/netstd/Server/Server.csproj
@@ -19,7 +19,7 @@
-->
<PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Server</AssemblyName>
<PackageId>Server</PackageId>
<OutputType>Exe</OutputType>