diff options
author | Jens Geyer <jensg@apache.org> | 2021-02-11 22:49:49 +0100 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2021-02-11 22:49:49 +0100 |
commit | b5fe1dbc0cac81ab99ec5d71de70f4389b234888 (patch) | |
tree | cc76956269678159418ed2106abd530736a1ad5a /test/netstd | |
parent | 876aee506b937d64b1fb035ff65e5e52def04c04 (diff) | |
download | thrift-b5fe1dbc0cac81ab99ec5d71de70f4389b234888.tar.gz |
Reverted wrongly pushed commits.
- This reverts commit 876aee506b937d64b1fb035ff65e5e52def04c04.
- This reverts commit b89316d54bb0253493b48446cb510755fb3196d2.
Diffstat (limited to 'test/netstd')
-rw-r--r-- | test/netstd/Client/Client.csproj | 2 | ||||
-rw-r--r-- | test/netstd/Referenz.txt | 20 | ||||
-rw-r--r-- | test/netstd/Server/Server.csproj | 2 | ||||
-rw-r--r-- | test/netstd/ThriftTest.sln | 63 |
4 files changed, 5 insertions, 82 deletions
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index ce71809dd..4ed57cbd9 100644 --- a/test/netstd/Client/Client.csproj +++ b/test/netstd/Client/Client.csproj @@ -31,7 +31,7 @@ <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> </PropertyGroup> <ItemGroup> - <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.2" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" /> <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> diff --git a/test/netstd/Referenz.txt b/test/netstd/Referenz.txt deleted file mode 100644 index 58088e4c9..000000000 --- a/test/netstd/Referenz.txt +++ /dev/null @@ -1,20 +0,0 @@ -E:\D\TPCPP\Thrift\wc-XE-all\wc-JensG-haxe\test\netstd\Client\bin\Release\netcoreapp3.1>Client.exe --performance -Setting up for ProtocolPeformanceTestAsync ... -RunTestAsync(TBinaryProtocol): write = 1982 msec -RunTestAsync(TBinaryProtocol): read = 4995 msec -RunTestAsync(TCompactProtocol): write = 1240 msec -RunTestAsync(TCompactProtocol): read = 3964 msec -RunTestAsync(TJsonProtocol): write = 5206 msec -RunTestAsync(TJsonProtocol): read = 23249 msec -RunTestAsync(TBinaryProtocol + TBufferedTransport): write = 1990 msec -RunTestAsync(TBinaryProtocol + TBufferedTransport): read = 5777 msec -RunTestAsync(TCompactProtocol + TBufferedTransport): write = 1453 msec -RunTestAsync(TCompactProtocol + TBufferedTransport): read = 4761 msec -RunTestAsync(TJsonProtocol + TBufferedTransport): write = 8859 msec -RunTestAsync(TJsonProtocol + TBufferedTransport): read = 30925 msec -RunTestAsync(TBinaryProtocol + TFramedTransport): write = 2042 msec -RunTestAsync(TBinaryProtocol + TFramedTransport): read = 5726 msec -RunTestAsync(TCompactProtocol + TFramedTransport): write = 1480 msec -RunTestAsync(TCompactProtocol + TFramedTransport): read = 4818 msec -RunTestAsync(TJsonProtocol + TFramedTransport): write = 8612 msec -RunTestAsync(TJsonProtocol + TFramedTransport): read = 30810 msec diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj index cbd0fb1f9..fa5ce4615 100644 --- a/test/netstd/Server/Server.csproj +++ b/test/netstd/Server/Server.csproj @@ -33,7 +33,7 @@ <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.2" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" /> <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> diff --git a/test/netstd/ThriftTest.sln b/test/netstd/ThriftTest.sln index 7e101d9e0..352576ef0 100644 --- a/test/netstd/ThriftTest.sln +++ b/test/netstd/ThriftTest.sln @@ -1,7 +1,6 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30104.148 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift", "..\..\lib\netstd\Thrift\Thrift.csproj", "{C20EA2A9-7660-47DE-9A49-D1EF12FB2895}" EndProject @@ -9,14 +8,6 @@ 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 @@ -63,54 +54,6 @@ 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 |