diff options
| -rw-r--r-- | compiler/cpp/compiler.vcxproj | 8 | ||||
| -rw-r--r-- | compiler/cpp/src/thrift/main.cc | 2 | ||||
| -rw-r--r-- | lib/delphi/Thrift.groupproj | 120 | ||||
| -rw-r--r-- | lib/delphi/Thrift.groupproj.local | 9 | ||||
| -rw-r--r-- | lib/delphi/test/Performance/Referenz.txt | 21 | ||||
| -rw-r--r-- | lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj | 2 | ||||
| -rw-r--r-- | lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj | 8 | ||||
| -rw-r--r-- | lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj | 10 | ||||
| -rw-r--r-- | lib/netstd/Thrift/Thrift.csproj | 16 | ||||
| -rw-r--r-- | test/haxe/src/Arguments.hx | 2 | ||||
| -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 | ||||
| -rw-r--r-- | tutorial/netstd/Client/Client.csproj | 2 | ||||
| -rw-r--r-- | tutorial/netstd/Server/Server.csproj | 2 |
16 files changed, 261 insertions, 28 deletions
diff --git a/compiler/cpp/compiler.vcxproj b/compiler/cpp/compiler.vcxproj index cbcf8eaa3..6e2bd8a96 100644 --- a/compiler/cpp/compiler.vcxproj +++ b/compiler/cpp/compiler.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -99,29 +99,34 @@ <ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>compiler</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v142</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -144,6 +149,7 @@ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath> <TargetName>thrift</TargetName> <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath> + <OutDir>E:\D\TOOLS\Thrift\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> diff --git a/compiler/cpp/src/thrift/main.cc b/compiler/cpp/src/thrift/main.cc index 50bdcea46..1ba8234a2 100644 --- a/compiler/cpp/src/thrift/main.cc +++ b/compiler/cpp/src/thrift/main.cc @@ -656,7 +656,7 @@ void error_unsupported_namespace_decl(const char* old_form, const char* new_form * Prints the version number */ void version() { - printf("Thrift version %s\n", THRIFT_VERSION); + printf("Thrift version %s (custom build)\n", THRIFT_VERSION); } /** diff --git a/lib/delphi/Thrift.groupproj b/lib/delphi/Thrift.groupproj new file mode 100644 index 000000000..f41f293ef --- /dev/null +++ b/lib/delphi/Thrift.groupproj @@ -0,0 +1,120 @@ + <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{86AE16E4-18D4-4C07-B06C-491E22A26C74}</ProjectGuid> + </PropertyGroup> + <ItemGroup> + <Projects Include="test\client.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\server.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\multiplexed\Multiplex.Test.Client.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\multiplexed\Multiplex.Test.Server.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\serializer\TestSerializer.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\skip\skiptest_version2.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\skip\skiptest_version1.dproj"> + <Dependencies/> + </Projects> + <Projects Include="test\typeregistry\TestTypeRegistry.dproj"> + <Dependencies/> + </Projects> + </ItemGroup> + <ProjectExtensions> + <Borland.Personality>Default.Personality.12</Borland.Personality> + <Borland.ProjectType/> + <BorlandProject> + <Default.Personality/> + </BorlandProject> + </ProjectExtensions> + <Target Name="client"> + <MSBuild Projects="test\client.dproj"/> + </Target> + <Target Name="client:Clean"> + <MSBuild Projects="test\client.dproj" Targets="Clean"/> + </Target> + <Target Name="client:Make"> + <MSBuild Projects="test\client.dproj" Targets="Make"/> + </Target> + <Target Name="server"> + <MSBuild Projects="test\server.dproj"/> + </Target> + <Target Name="server:Clean"> + <MSBuild Projects="test\server.dproj" Targets="Clean"/> + </Target> + <Target Name="server:Make"> + <MSBuild Projects="test\server.dproj" Targets="Make"/> + </Target> + <Target Name="Multiplex_Test_Client"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj"/> + </Target> + <Target Name="Multiplex_Test_Client:Clean"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj" Targets="Clean"/> + </Target> + <Target Name="Multiplex_Test_Client:Make"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj" Targets="Make"/> + </Target> + <Target Name="Multiplex_Test_Server"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj"/> + </Target> + <Target Name="Multiplex_Test_Server:Clean"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj" Targets="Clean"/> + </Target> + <Target Name="Multiplex_Test_Server:Make"> + <MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj" Targets="Make"/> + </Target> + <Target Name="TestSerializer"> + <MSBuild Projects="test\serializer\TestSerializer.dproj"/> + </Target> + <Target Name="TestSerializer:Clean"> + <MSBuild Projects="test\serializer\TestSerializer.dproj" Targets="Clean"/> + </Target> + <Target Name="TestSerializer:Make"> + <MSBuild Projects="test\serializer\TestSerializer.dproj" Targets="Make"/> + </Target> + <Target Name="skiptest_version2"> + <MSBuild Projects="test\skip\skiptest_version2.dproj"/> + </Target> + <Target Name="skiptest_version2:Clean"> + <MSBuild Projects="test\skip\skiptest_version2.dproj" Targets="Clean"/> + </Target> + <Target Name="skiptest_version2:Make"> + <MSBuild Projects="test\skip\skiptest_version2.dproj" Targets="Make"/> + </Target> + <Target Name="skiptest_version1"> + <MSBuild Projects="test\skip\skiptest_version1.dproj"/> + </Target> + <Target Name="skiptest_version1:Clean"> + <MSBuild Projects="test\skip\skiptest_version1.dproj" Targets="Clean"/> + </Target> + <Target Name="skiptest_version1:Make"> + <MSBuild Projects="test\skip\skiptest_version1.dproj" Targets="Make"/> + </Target> + <Target Name="TestTypeRegistry"> + <MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj"/> + </Target> + <Target Name="TestTypeRegistry:Clean"> + <MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj" Targets="Clean"/> + </Target> + <Target Name="TestTypeRegistry:Make"> + <MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj" Targets="Make"/> + </Target> + <Target Name="Build"> + <CallTarget Targets="client;server;Multiplex_Test_Client;Multiplex_Test_Server;TestSerializer;skiptest_version2;skiptest_version1;TestTypeRegistry"/> + </Target> + <Target Name="Clean"> + <CallTarget Targets="client:Clean;server:Clean;Multiplex_Test_Client:Clean;Multiplex_Test_Server:Clean;TestSerializer:Clean;skiptest_version2:Clean;skiptest_version1:Clean;TestTypeRegistry:Clean"/> + </Target> + <Target Name="Make"> + <CallTarget Targets="client:Make;server:Make;Multiplex_Test_Client:Make;Multiplex_Test_Server:Make;TestSerializer:Make;skiptest_version2:Make;skiptest_version1:Make;TestTypeRegistry:Make"/> + </Target> + <Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/> + </Project> diff --git a/lib/delphi/Thrift.groupproj.local b/lib/delphi/Thrift.groupproj.local new file mode 100644 index 000000000..9e6e18dab --- /dev/null +++ b/lib/delphi/Thrift.groupproj.local @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<BorlandProject> + <Transactions> + <Transaction>1899.12.30 00:00:00.000.873,E:\D\TPCPP\Thrift\wc-XE-all\wc-JensG-haxe\lib\delphi\Thrift.groupproj=C:\Users\Jens\Documents\RAD Studio\Projekte\ProjectGroup1.groupproj</Transaction> + </Transactions> + <Default.Personality> + <Projects ActiveProject="E:\D\TPCPP\Thrift\wc-XE-all\wc-JensG-haxe\lib\delphi\test\client.dproj"/> + </Default.Personality> +</BorlandProject> diff --git a/lib/delphi/test/Performance/Referenz.txt b/lib/delphi/test/Performance/Referenz.txt new file mode 100644 index 000000000..53cb154f6 --- /dev/null +++ b/lib/delphi/test/Performance/Referenz.txt @@ -0,0 +1,21 @@ +Delphi TestClient 0.14.0 +Setting up for ProtocolPeformanceTest ... +RunTest(binary): write = 2650 msec +RunTest(binary): read = 3135 msec +RunTest(compact): write = 2807 msec +RunTest(compact): read = 3053 msec +RunTest(JSON): write = 13251 msec +RunTest(JSON): read = 18759 msec +RunTest(binary + buffered): write = 2635 msec +RunTest(binary + buffered): read = 3109 msec +RunTest(compact + buffered): write = 2788 msec +RunTest(compact + buffered): read = 3069 msec +RunTest(JSON + buffered): write = 13604 msec +RunTest(JSON + buffered): read = 21537 msec +RunTest(binary + framed): write = 3019 msec +RunTest(binary + framed): read = 3573 msec +RunTest(compact + framed): write = 3201 msec +RunTest(compact + framed): read = 3504 msec +RunTest(JSON + framed): write = 15093 msec +RunTest(JSON + framed): read = 21548 msec +Hit ENTER ...
\ No newline at end of file diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj index 35138d863..740d223c8 100644 --- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj +++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj @@ -25,7 +25,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="BenchmarkDotNet" Version="0.12.0" /> + <PackageReference Include="BenchmarkDotNet" Version="0.12.1" /> </ItemGroup> <ItemGroup> diff --git a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj index 7c5639bc7..318757ab4 100644 --- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj +++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj @@ -32,10 +32,10 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="CompareNETObjects" Version="4.64.0" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" /> - <PackageReference Include="MSTest.TestFramework" Version="2.0.0" /> + <PackageReference Include="CompareNETObjects" Version="4.66.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" /> + <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" /> + <PackageReference Include="MSTest.TestFramework" Version="2.1.2" /> <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" /> </ItemGroup> <ItemGroup> diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj index 4b39e7d4b..9b54a57af 100644 --- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj +++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj @@ -21,11 +21,11 @@ <TargetFramework>netcoreapp3.1</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageReference Include="CompareNETObjects" Version="4.64.0" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" /> - <PackageReference Include="MSTest.TestFramework" Version="2.0.0" /> - <PackageReference Include="NSubstitute" Version="4.2.1" /> + <PackageReference Include="CompareNETObjects" Version="4.66.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" /> + <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" /> + <PackageReference Include="MSTest.TestFramework" Version="2.1.2" /> + <PackageReference Include="NSubstitute" Version="4.2.2" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\Thrift\Thrift.csproj" /> diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj index 3278d98f2..991e64e6d 100644 --- a/lib/netstd/Thrift/Thrift.csproj +++ b/lib/netstd/Thrift/Thrift.csproj @@ -44,16 +44,16 @@ <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> - <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" /> - <PackageReference Include="System.IO.Pipes" Version="[4.3,)" /> + <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" /> + <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" /> + <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" /> + <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.Net.NameResolution" Version="[4.3,)" /> - <PackageReference Include="System.Net.Requests" Version="[4.3,)" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.2" /> + <PackageReference Include="System.Net.NameResolution" Version="4.3.0" /> + <PackageReference Include="System.Net.Requests" Version="4.3.0" /> <PackageReference Include="System.Net.Security" Version="4.3.2" /> - <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> </ItemGroup> <Target Name="SetTFMAssemblyAttributesPath" BeforeTargets="GenerateTargetFrameworkMonikerAttribute"> diff --git a/test/haxe/src/Arguments.hx b/test/haxe/src/Arguments.hx index 56e525356..023f250fd 100644 --- a/test/haxe/src/Arguments.hx +++ b/test/haxe/src/Arguments.hx @@ -92,7 +92,7 @@ class Arguments #if sys private static function GetHelp() : String { - var sProg = Path.withoutDirectory( Sys.executablePath()); + var sProg = Path.withoutDirectory( Sys.programPath()); return "\n" +sProg+" [client|server] [options]\n" +"\n" diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index 4ed57cbd9..ce71809dd 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.0" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.2" /> <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 new file mode 100644 index 000000000..58088e4c9 --- /dev/null +++ b/test/netstd/Referenz.txt @@ -0,0 +1,20 @@ +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 fa5ce4615..cbd0fb1f9 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.0" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.2" /> <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 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 diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj index 10d5040f0..81b503f14 100644 --- a/tutorial/netstd/Client/Client.csproj +++ b/tutorial/netstd/Client/Client.csproj @@ -30,7 +30,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" /> + <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" /> </ItemGroup> <ItemGroup> diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj index b3ff516e3..95eabd37d 100644 --- a/tutorial/netstd/Server/Server.csproj +++ b/tutorial/netstd/Server/Server.csproj @@ -38,7 +38,7 @@ <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" /> - <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.0" /> + <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.4" /> </ItemGroup> </Project> |