diff options
Diffstat (limited to 'lib/netstd')
6 files changed, 27 insertions, 46 deletions
diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj index 0e29b3b78..aed36cdcb 100644 --- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj +++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj @@ -20,14 +20,14 @@ <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net7.0</TargetFramework> <TieredCompilation>false</TieredCompilation> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> - <PackageReference Include="BenchmarkDotNet" Version="0.13.1" /> + <PackageReference Include="BenchmarkDotNet" Version="0.13.4" /> </ItemGroup> <ItemGroup> @@ -35,7 +35,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" /> + <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> </ItemGroup> </Project> diff --git a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj index d661f60f1..19065c6b6 100644 --- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj +++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj @@ -19,7 +19,7 @@ --> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net7.0</TargetFramework> <AssemblyName>Thrift.IntegrationTests</AssemblyName> <PackageId>Thrift.IntegrationTests</PackageId> <Version>0.19.0.0</Version> @@ -34,11 +34,11 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="CompareNETObjects" Version="4.74.0" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /> - <PackageReference Include="MSTest.TestFramework" Version="2.2.8" /> - <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" /> + <PackageReference Include="CompareNETObjects" Version="4.79.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" /> + <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" /> + <PackageReference Include="MSTest.TestFramework" Version="3.0.2" /> + <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\Thrift\Thrift.csproj" /> @@ -47,7 +47,7 @@ <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> <ItemGroup> - <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" /> + <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj index 20f74e646..990b24051 100644 --- a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj +++ b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj @@ -21,7 +21,7 @@ <PropertyGroup> <ThriftVersion>0.19.0</ThriftVersion> <ThriftVersionOutput>Thrift version $(ThriftVersion)</ThriftVersionOutput> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net7.0</TargetFramework> <Version>$(ThriftVersion).0</Version> <AssemblyName>Thrift.PublicInterfaces.Compile.Tests</AssemblyName> <PackageId>Thrift.PublicInterfaces.Compile.Tests</PackageId> @@ -37,11 +37,11 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" /> + <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" /> </ItemGroup> <ItemGroup> - <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" /> + <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> </ItemGroup> <Target Name="PreBuild" BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile"> diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj index 8a0e25db4..bae55ea5c 100644 --- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj +++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj @@ -19,17 +19,17 @@ --> <PropertyGroup> - <TargetFramework>net6.0</TargetFramework> + <TargetFramework>net7.0</TargetFramework> <Version>0.19.0.0</Version> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> - <PackageReference Include="CompareNETObjects" Version="4.74.0" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" /> - <PackageReference Include="MSTest.TestFramework" Version="2.2.8" /> - <PackageReference Include="NSubstitute" Version="4.2.2" /> + <PackageReference Include="CompareNETObjects" Version="4.79.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" /> + <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" /> + <PackageReference Include="MSTest.TestFramework" Version="3.0.2" /> + <PackageReference Include="NSubstitute" Version="5.0.0" /> </ItemGroup> <ItemGroup> @@ -42,6 +42,6 @@ </ItemGroup> <ItemGroup> - <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" /> + <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj index 42f193204..760ffe4a0 100644 --- a/lib/netstd/Thrift/Thrift.csproj +++ b/lib/netstd/Thrift/Thrift.csproj @@ -19,7 +19,7 @@ --> <PropertyGroup> - <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0</TargetFrameworks> + <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0</TargetFrameworks> <AssemblyName>Thrift</AssemblyName> <PackageId>ApacheThrift</PackageId> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> @@ -57,12 +57,12 @@ <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> - <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" /> + <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> + <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" /> + <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> <PackageReference Include="System.IO.Pipes" Version="[4.3,)" /> <PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" /> - <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" /> + <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" /> <PackageReference Include="System.Net.NameResolution" Version="[4.3,)" /> <PackageReference Include="System.Net.Requests" Version="[4.3,)" /> <PackageReference Include="System.Net.Security" Version="4.3.2" /> @@ -70,11 +70,11 @@ </ItemGroup> <ItemGroup> - <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" /> + <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" /> </ItemGroup> <ItemGroup> - <None Include="..\README.md" Pack="true" PackagePath="\"/> + <None Include="..\README.md" Pack="true" PackagePath="\" /> </ItemGroup> <Target Name="SetTFMAssemblyAttributesPath" BeforeTargets="GenerateTargetFrameworkMonikerAttribute"> diff --git a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs index 8ad62aa14..66018b085 100644 --- a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs +++ b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs @@ -32,13 +32,6 @@ using System.Diagnostics; namespace Thrift.Transport.Server { - [Obsolete("NamedPipeClientFlags is deprecated, use NamedPipeServerFlags instead.")] - [Flags] - public enum NamedPipeClientFlags { // bad name - None = 0x00, - OnlyLocalClients = 0x01 - }; - [Flags] public enum NamedPipeServerFlags { @@ -84,18 +77,6 @@ namespace Thrift.Transport.Server _numListenPipes = (byte)numListenPipes; } - [Obsolete("NamedPipeClientFlags is deprecated, use NamedPipeServerFlags instead.")] - public TNamedPipeServerTransport(string pipeAddress, TConfiguration config, NamedPipeClientFlags flags, int numListenPipes = 1) - : base(config) - { - if ((numListenPipes < 1) || (numListenPipes > 254)) - throw new ArgumentOutOfRangeException(nameof(numListenPipes), "Value must be in the range of [1..254]"); - - _pipeAddress = pipeAddress; - _onlyLocalClients = flags.HasFlag(NamedPipeClientFlags.OnlyLocalClients); - _numListenPipes = (byte)numListenPipes; - } - public override bool IsOpen() { return true; |