Allow nuget to be compatible v4.5

openzipkin · Jul 20, 2017 · 2bcd6a5 · 2bcd6a5
1 parent 74f00b8
commit 2bcd6a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/zipkin4net/Criteo.Profiling.Tracing/Criteo.Profiling.Tracing.dotnetcore.csproj b/zipkin4net/Criteo.Profiling.Tracing/Criteo.Profiling.Tracing.dotnetcore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
     <AssemblyName>Criteo.Profiling.Tracing</AssemblyName>
     <PackageId>Criteo.Profiling.Tracing</PackageId>
     <Title>Criteo.Profiling.Tracing</Title>
@@ -28,14 +28,16 @@
     <DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
     <PackageReference Include="apache-thrift-netcore" Version="0.9.3" />
   </ItemGroup>
 

diff --git a/zipkin4net/buildAndTest.sh b/zipkin4net/buildAndTest.sh
@@ -10,10 +10,14 @@ function check_availability() {
 }
 
 solution="zipkin4net.dotnetcore.sln"
+src="Criteo.Profiling.Tracing/Criteo.Profiling.Tracing.dotnetcore.csproj"
 tests="Criteo.Profiling.Tracing.UTest/Criteo.Profiling.Tracing.UTest.dotnetcore.csproj"
+benchmark="Criteo.Profiling.Tracing.Benchmark/Criteo.Profiling.Tracing.Benchmark.dotnetcore.csproj"
 
 check_availability "dotnet"
 
 dotnet restore  $solution   \
-&& dotnet build $solution   \
-&& dotnet test $tests       \
+&& dotnet build -f "netstandard1.5" $src         \
+&& dotnet build -f "netcoreapp1.1" $benchmark         \
+&& dotnet build -f "netcoreapp1.0" $tests        \
+&& dotnet test -f "netcoreapp1.0" $tests           \