Bump all versions to 1.1.0

openzipkin · Oct 26, 2017 · 17e1866 · 17e1866
1 parent e1022c8
commit 17e1866
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/Examples/owin/common/common.csproj b/Examples/owin/common/common.csproj
@@ -33,9 +33,6 @@
     <Reference Include="apache-thrift-netcore, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\apache-thrift-netcore.0.9.3.1\lib\net35\apache-thrift-netcore.dll</HintPath>
     </Reference>
-    <Reference Include="zipkin4net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\zipkin4net.1.0.0\lib\net45\zipkin4net.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -69,6 +66,10 @@
     <ProjectReference Include="..\..\..\Src\zipkin4net.middleware.owin\Src\zipkin4net.middleware.owin.csproj">
       <Project>{6a57c709-4443-4735-94cf-19de60b00f59}</Project>
       <Name>zipkin4net.middleware.owin</Name>
+    </ProjectReference>
+	<ProjectReference Include="..\..\..\Src\zipkin4net\Src\zipkin4net.csproj">
+      <Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
+      <Name>zipkin4net</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Examples/owin/frontend/frontend.csproj b/Examples/owin/frontend/frontend.csproj
@@ -34,9 +34,6 @@
     <Reference Include="apache-thrift-netcore, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\apache-thrift-netcore.0.9.3.1\lib\net35\apache-thrift-netcore.dll</HintPath>
     </Reference>
-    <Reference Include="zipkin4net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\zipkin4net.1.0.0\lib\net45\zipkin4net.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -81,6 +78,10 @@
       <Project>{13a1d84e-7b4b-44c1-853a-13b9e260256d}</Project>
       <Name>common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Src\zipkin4net\Src\zipkin4net.csproj">
+      <Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
+      <Name>zipkin4net</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.csproj b/Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.csproj
@@ -32,7 +32,12 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" Version="1.1.1" />
     <Reference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
-    <Reference Include="Criteo.Profiling.Tracing" Version="0.4.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\zipkin4net\Src\zipkin4net.csproj">
+      <Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
+      <Name>zipkin4net</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="TracingMiddleware.cs" />

diff --git a/Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.dotnetcore.csproj b/Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.dotnetcore.csproj
@@ -6,7 +6,7 @@
     <PackageId>zipkin4net.middleware.aspnetcore</PackageId>
     <Description>Asp.net core middleware for zipkin4net</Description>
     <Copyright>Copyright 2017, Criteo</Copyright>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <Authors>Criteo</Authors>
     <TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
     <PackageTags>Zipkin;Tracer;Tracing;Criteo;Asp.net core</PackageTags>

diff --git a/Src/zipkin4net.middleware.owin/Src/Properties/AssemblyInfo.cs b/Src/zipkin4net.middleware.owin/Src/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: InternalsVisibleTo("zipkin4net.middleware.owin.Tests")]
diff --git a/Src/zipkin4net.middleware.owin/Tests/Properties/AssemblyInfo.cs b/Src/zipkin4net.middleware.owin/Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/Src/zipkin4net/Src/zipkin4net.csproj b/Src/zipkin4net/Src/zipkin4net.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -112,6 +112,7 @@
     <Compile Include="Tracers\Zipkin\ZipkinAnnotation.cs" />
     <Compile Include="Tracers\Zipkin\ZipkinAnnotationVisitor.cs" />
     <Compile Include="Tracers\Zipkin\ZipkinTracer.cs" />
+    <Compile Include="Transport\Http\HttpZipkinSender.cs" />
     <Compile Include="Transport\ZipkinHttpHeaders.cs" />
     <Compile Include="Transport\ZipkinHttpTraceExtractor.cs" />
     <Compile Include="Transport\ZipkinHttpTraceInjector.cs" />
@@ -141,4 +142,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>