Update dependencies and use multi targeting (#15)

* Update dependencies and use multi targeting * Test against latest versions * Use "Visual Studio 2019" image in appveyor * Use Grpc 2.26.0 to fix bug * Test with latest Google.Protobuf version
opentracing-contrib · Jan 15, 2020 · 20a6abf · 20a6abf
1 parent 989060d
commit 20a6abf
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 778 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,7 @@
 # AppVeyor Build number is incremental and not related to actual version number of the product
 version: '{build}'
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 init:
   - cmd: git config --global core.autocrlf true

diff --git a/OpenTracing.Contrib.sln b/OpenTracing.Contrib.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B72DE217-C3BF-4F75-9741-2B74E3847443}"
 	ProjectSection(SolutionItems) = preProject
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
 		README.md = README.md
+		version.props = version.props
 	EndProjectSection
 EndProject
 Global

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.GitHub" Version="2.8.1" PrivateAssets="All" />
-    <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.8.1" />
-    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.8.1" />
+    <PackageReference Include="SourceLink.Create.GitHub" Version="2.8.3" PrivateAssets="All" />
+    <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.8.3" />
+    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.8.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenTracing.Contrib.Grpc/OpenTracing.Contrib.Grpc.csproj b/src/OpenTracing.Contrib.Grpc/OpenTracing.Contrib.Grpc.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFrameworks>net45;netstandard1.5;netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <Description>Adds OpenTracing instrumentation for .NET Standard apps that use GRPC.</Description>
     <PackageTags>opentracing;distributed-tracing;tracing;grpc;netstandard</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- Main dependencies -->
-    <PackageReference Include="Grpc" Version="1.12.0" />
-    <PackageReference Include="OpenTracing" Version="0.12.0" />
+    <PackageReference Include="Grpc" Version="2.23.1" />
+    <PackageReference Include="OpenTracing" Version="0.12.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenTracing.Contrib.Grpc/Streaming/TracingAsyncStreamReader.cs b/src/OpenTracing.Contrib.Grpc/Streaming/TracingAsyncStreamReader.cs
@@ -20,7 +20,6 @@ public TracingAsyncStreamReader(IAsyncStreamReader<T> reader, Action<T> onMessag
             _onException = onException;
         }
 
-        public void Dispose() => _reader.Dispose();
         public T Current => _reader.Current;
 
         public async Task<bool> MoveNext(CancellationToken cancellationToken)

diff --git a/test/OpenTracing.Contrib.Grpc.Test/AddressbookGrpc.cs b/test/OpenTracing.Contrib.Grpc.Test/AddressbookGrpc.cs
diff --git a/test/OpenTracing.Contrib.Grpc.Test/OpenTracing.Contrib.Grpc.Test.csproj b/test/OpenTracing.Contrib.Grpc.Test/OpenTracing.Contrib.Grpc.Test.csproj
@@ -2,15 +2,20 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>OpenTracing.Contrib.Grpc.Test</RootNamespace>
     <AssemblyName>OpenTracing.Contrib.Grpc.Test</AssemblyName>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.5.1" />
-    <PackageReference Include="Grpc" Version="1.12.0" />
+    <Protobuf Include="protos\addressbook.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
+    <PackageReference Include="Grpc.Tools" Version="2.26.0" PrivateAssets="all" />
+    <PackageReference Include="Grpc" Version="2.26.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/OpenTracing.Contrib.Grpc.Test/Program.cs b/test/OpenTracing.Contrib.Grpc.Test/Program.cs
@@ -53,7 +53,7 @@ private static async Task MainAsync()
 
             var client = new Phone.PhoneClient(new Channel("localhost:8011", ChannelCredentials.Insecure).Intercept(tracingInterceptor));
             var request = new Person { Name = "Karl Heinz" };
-            var response1 = await client.GetNameAsync(request);
+            var _ = await client.GetNameAsync(request);
 
             var response2 = client.GetNameRequestStream();
             await response2.RequestStream.WriteAsync(request);