Skip to content

Commit 6185928

Browse files
authored
Merge pull request #32 from roji/Grpc
Target net462 for gRPC WinHttpHandler support
2 parents 86a3d2c + 77d9c3c commit 6185928

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageVersion Include="Google.Protobuf" Version="3.23.4" />
5-
<PackageVersion Include="Grpc.Net.Client" Version="2.55.0" />
6-
<PackageVersion Include="Grpc.Tools" Version="2.56.2" />
4+
<PackageVersion Include="Google.Protobuf" Version="3.24.2" />
5+
<PackageVersion Include="Grpc.Net.Client" Version="2.56.0" />
6+
<PackageVersion Include="Grpc.Tools" Version="2.57.0" />
77
<PackageVersion Include="System.Text.Json" Version="7.0.3" />
88
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
99

Milvus.Client/Diagnostics/CompilerAttributes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace System.Runtime.CompilerServices;
88

9-
#if NETSTANDARD2_0
9+
#if NETSTANDARD2_0 || NET462
1010

1111
using ComponentModel;
1212

Milvus.Client/Milvus.Client.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<!-- We target net462 directly since the net462 version of Grpc.Net.Client automatically uses WinHttpHandler -->
5+
<TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
56
<TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net6.0</TargetFrameworks>
67
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
78
<AnalysisMode>All</AnalysisMode>
@@ -43,7 +44,7 @@
4344
<PackageReference Include="System.Text.Json" />
4445
</ItemGroup>
4546

46-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
47+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'">
4748
<PackageReference Include="Microsoft.Bcl.HashCode" />
4849
</ItemGroup>
4950

Milvus.Client/MilvusException.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
namespace Milvus.Client;
1+
#if NET462
2+
using System.Runtime.Serialization;
3+
#endif
4+
5+
namespace Milvus.Client;
26

37
/// <summary>
48
/// Exception thrown for errors related to the Milvus client.
59
/// </summary>
10+
#if NET462
11+
[Serializable]
12+
#endif
613
public sealed class MilvusException : Exception
714
{
815
/// <summary>
@@ -33,4 +40,11 @@ public MilvusException(MilvusErrorCode errorCode, string reason)
3340
{
3441
ErrorCode = errorCode;
3542
}
43+
44+
#if NET462
45+
private MilvusException(SerializationInfo info, StreamingContext context)
46+
{
47+
info.AddValue(nameof(ErrorCode), ErrorCode);
48+
}
49+
#endif
3650
}

0 commit comments

Comments
 (0)