diff options
author | Jens Geyer <jensg@apache.org> | 2021-02-13 13:58:09 +0100 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2021-02-15 09:12:56 +0100 |
commit | 526a1acf3b870d3b292423e19b9bb9bb0d18c0c3 (patch) | |
tree | f78dff8ef9bfdd5daa79ed6ef8cf53ca5327102d /test/netstd | |
parent | 8461365378328735066e5597af65d1e99aea611a (diff) | |
download | thrift-526a1acf3b870d3b292423e19b9bb9bb0d18c0c3.tar.gz |
THRIFT-5349 Add net5.0 as supported platform
Client: netstd
Patch: Jens Geyer
This closes #2328
Diffstat (limited to 'test/netstd')
-rw-r--r-- | test/netstd/Client/Client.csproj | 6 | ||||
-rw-r--r-- | test/netstd/Client/GlobalSuppressions.cs | 26 | ||||
-rw-r--r-- | test/netstd/Client/Program.cs | 17 | ||||
-rw-r--r-- | test/netstd/Server/GlobalSuppressions.cs | 26 | ||||
-rw-r--r-- | test/netstd/Server/Program.cs | 15 | ||||
-rw-r--r-- | test/netstd/Server/Server.csproj | 8 | ||||
-rw-r--r-- | test/netstd/ThriftTest.sln | 63 |
7 files changed, 138 insertions, 23 deletions
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index a09c3175b..828ea7394 100644 --- a/test/netstd/Client/Client.csproj +++ b/test/netstd/Client/Client.csproj @@ -19,7 +19,7 @@ --> <PropertyGroup> - <TargetFramework>netcoreapp3.1</TargetFramework> + <TargetFramework>net5.0</TargetFramework> <AssemblyName>Client</AssemblyName> <PackageId>Client</PackageId> <OutputType>Exe</OutputType> @@ -32,9 +32,9 @@ <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> </PropertyGroup> <ItemGroup> - <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" /> - <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" /> + <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> </ItemGroup> <ItemGroup> diff --git a/test/netstd/Client/GlobalSuppressions.cs b/test/netstd/Client/GlobalSuppressions.cs new file mode 100644 index 000000000..34fdc7953 --- /dev/null +++ b/test/netstd/Client/GlobalSuppressions.cs @@ -0,0 +1,26 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("Performance", "CA1822", Justification = "<Ausstehend>", Scope = "module")] +[assembly: SuppressMessage("Style", "IDE0083", Justification = "<Ausstehend>", Scope = "module")] diff --git a/test/netstd/Client/Program.cs b/test/netstd/Client/Program.cs index 0fe2ccee2..7e502cdf6 100644 --- a/test/netstd/Client/Program.cs +++ b/test/netstd/Client/Program.cs @@ -26,13 +26,16 @@ namespace Client { public static int Main(string[] args) { - try - { - Console.SetBufferSize(Console.BufferWidth, 4096); - } - catch (Exception) - { - Console.WriteLine("Failed to grow scroll-back buffer"); + if (OperatingSystem.IsWindows()) + { + try + { + Console.SetBufferSize(Console.BufferWidth, 4096); + } + catch (Exception) + { + Console.WriteLine("Failed to grow scroll-back buffer"); + } } // run whatever mode is choosen, default to test impl diff --git a/test/netstd/Server/GlobalSuppressions.cs b/test/netstd/Server/GlobalSuppressions.cs new file mode 100644 index 000000000..34fdc7953 --- /dev/null +++ b/test/netstd/Server/GlobalSuppressions.cs @@ -0,0 +1,26 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage("Performance", "CA1822", Justification = "<Ausstehend>", Scope = "module")] +[assembly: SuppressMessage("Style", "IDE0083", Justification = "<Ausstehend>", Scope = "module")] diff --git a/test/netstd/Server/Program.cs b/test/netstd/Server/Program.cs index 8414b4810..0052bcee4 100644 --- a/test/netstd/Server/Program.cs +++ b/test/netstd/Server/Program.cs @@ -26,13 +26,16 @@ namespace Server { public static int Main(string[] args) { - try + if (OperatingSystem.IsWindows()) { - Console.SetBufferSize(Console.BufferWidth, 4096); - } - catch (Exception) - { - Console.WriteLine("Failed to grow scroll-back buffer"); + try + { + Console.SetBufferSize(Console.BufferWidth, 4096); + } + catch (Exception) + { + Console.WriteLine("Failed to grow scroll-back buffer"); + } } // run whatever mode is choosen, default to test impl diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj index 39d294e08..fe1c394e9 100644 --- a/test/netstd/Server/Server.csproj +++ b/test/netstd/Server/Server.csproj @@ -19,7 +19,7 @@ --> <PropertyGroup> - <TargetFramework>netcoreapp3.1</TargetFramework> + <TargetFramework>net5.0</TargetFramework> <AssemblyName>Server</AssemblyName> <PackageId>Server</PackageId> <OutputType>Exe</OutputType> @@ -33,10 +33,10 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="System.IO.Pipes" Version="4.3.0" /> - <PackageReference Include="System.IO.Pipes.AccessControl" Version="4.5.1" /> - <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" /> + <PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" /> - <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" /> + <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> </ItemGroup> <ItemGroup> diff --git a/test/netstd/ThriftTest.sln b/test/netstd/ThriftTest.sln index 352576ef0..7e101d9e0 100644 --- a/test/netstd/ThriftTest.sln +++ b/test/netstd/ThriftTest.sln @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.12 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30104.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift", "..\..\lib\netstd\Thrift\Thrift.csproj", "{C20EA2A9-7660-47DE-9A49-D1EF12FB2895}" EndProject @@ -8,6 +9,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{0C6E8685-F191-4479-9842-882A38961127}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.IntegrationTests", "..\..\lib\netstd\Tests\Thrift.IntegrationTests\Thrift.IntegrationTests.csproj", "{C8148BFF-B943-4474-8D33-A641C6FD3DAB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.PublicInterfaces.Compile.Tests", "..\..\lib\netstd\Tests\Thrift.PublicInterfaces.Compile.Tests\Thrift.PublicInterfaces.Compile.Tests.csproj", "{5D86C1B6-0CDA-4D1D-80A5-240583B21148}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Tests", "..\..\lib\netstd\Tests\Thrift.Tests\Thrift.Tests.csproj", "{37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Benchmarks", "..\..\lib\netstd\Benchmarks\Thrift.Benchmarks\Thrift.Benchmarks.csproj", "{66946544-8DE7-45E9-8D0E-93EADA028D44}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -54,6 +63,54 @@ Global {0C6E8685-F191-4479-9842-882A38961127}.Release|x64.Build.0 = Release|Any CPU {0C6E8685-F191-4479-9842-882A38961127}.Release|x86.ActiveCfg = Release|Any CPU {0C6E8685-F191-4479-9842-882A38961127}.Release|x86.Build.0 = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|x64.ActiveCfg = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|x64.Build.0 = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|x86.ActiveCfg = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Debug|x86.Build.0 = Debug|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|Any CPU.Build.0 = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|x64.ActiveCfg = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|x64.Build.0 = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|x86.ActiveCfg = Release|Any CPU + {C8148BFF-B943-4474-8D33-A641C6FD3DAB}.Release|x86.Build.0 = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|x64.ActiveCfg = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|x64.Build.0 = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|x86.ActiveCfg = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Debug|x86.Build.0 = Debug|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|Any CPU.Build.0 = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|x64.ActiveCfg = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|x64.Build.0 = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|x86.ActiveCfg = Release|Any CPU + {5D86C1B6-0CDA-4D1D-80A5-240583B21148}.Release|x86.Build.0 = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|x64.ActiveCfg = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|x64.Build.0 = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|x86.ActiveCfg = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Debug|x86.Build.0 = Debug|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|Any CPU.Build.0 = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|x64.ActiveCfg = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|x64.Build.0 = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|x86.ActiveCfg = Release|Any CPU + {37FDED71-F8FB-434B-B2A8-1C53CCD9FD38}.Release|x86.Build.0 = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|x64.ActiveCfg = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|x64.Build.0 = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|x86.ActiveCfg = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Debug|x86.Build.0 = Debug|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|Any CPU.Build.0 = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x64.ActiveCfg = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x64.Build.0 = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.ActiveCfg = Release|Any CPU + {66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |