Skip to content

Commit 17e1866

Browse files
author
Pierre-Hugues Jeanneret
committed
Bump all versions to 1.1.0
1 parent e1022c8 commit 17e1866

File tree

7 files changed

+22
-14
lines changed

7 files changed

+22
-14
lines changed

Examples/owin/common/common.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<Reference Include="apache-thrift-netcore, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
3434
<HintPath>..\packages\apache-thrift-netcore.0.9.3.1\lib\net35\apache-thrift-netcore.dll</HintPath>
3535
</Reference>
36-
<Reference Include="zipkin4net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>$(SolutionDir)\packages\zipkin4net.1.0.0\lib\net45\zipkin4net.dll</HintPath>
38-
</Reference>
3936
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4037
<HintPath>$(SolutionDir)\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
4138
</Reference>
@@ -69,6 +66,10 @@
6966
<ProjectReference Include="..\..\..\Src\zipkin4net.middleware.owin\Src\zipkin4net.middleware.owin.csproj">
7067
<Project>{6a57c709-4443-4735-94cf-19de60b00f59}</Project>
7168
<Name>zipkin4net.middleware.owin</Name>
69+
</ProjectReference>
70+
<ProjectReference Include="..\..\..\Src\zipkin4net\Src\zipkin4net.csproj">
71+
<Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
72+
<Name>zipkin4net</Name>
7273
</ProjectReference>
7374
</ItemGroup>
7475
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Examples/owin/frontend/frontend.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
<Reference Include="apache-thrift-netcore, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
3535
<HintPath>$(SolutionDir)\packages\apache-thrift-netcore.0.9.3.1\lib\net35\apache-thrift-netcore.dll</HintPath>
3636
</Reference>
37-
<Reference Include="zipkin4net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>$(SolutionDir)\packages\zipkin4net.1.0.0\lib\net45\zipkin4net.dll</HintPath>
39-
</Reference>
4037
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4138
<HintPath>$(SolutionDir)\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
4239
</Reference>
@@ -81,6 +78,10 @@
8178
<Project>{13a1d84e-7b4b-44c1-853a-13b9e260256d}</Project>
8279
<Name>common</Name>
8380
</ProjectReference>
81+
<ProjectReference Include="..\..\..\Src\zipkin4net\Src\zipkin4net.csproj">
82+
<Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
83+
<Name>zipkin4net</Name>
84+
</ProjectReference>
8485
</ItemGroup>
8586
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8687
</Project>

Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@
3232
<ItemGroup>
3333
<Reference Include="Microsoft.AspNetCore" Version="1.1.1" />
3434
<Reference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
35-
<Reference Include="Criteo.Profiling.Tracing" Version="0.4.3" />
35+
</ItemGroup>
36+
<ItemGroup>
37+
<ProjectReference Include="..\..\zipkin4net\Src\zipkin4net.csproj">
38+
<Project>{48712463-66ff-4c76-b63d-097b57a1477f}</Project>
39+
<Name>zipkin4net</Name>
40+
</ProjectReference>
3641
</ItemGroup>
3742
<ItemGroup>
3843
<Compile Include="TracingMiddleware.cs" />

Src/zipkin4net.middleware.aspnetcore/Src/zipkin4net.middleware.aspnetcore.dotnetcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>zipkin4net.middleware.aspnetcore</PackageId>
77
<Description>Asp.net core middleware for zipkin4net</Description>
88
<Copyright>Copyright 2017, Criteo</Copyright>
9-
<VersionPrefix>1.0.0</VersionPrefix>
9+
<VersionPrefix>1.1.0</VersionPrefix>
1010
<Authors>Criteo</Authors>
1111
<TargetFrameworks>net461;netstandard1.6</TargetFrameworks>
1212
<PackageTags>Zipkin;Tracer;Tracing;Criteo;Asp.net core</PackageTags>

Src/zipkin4net.middleware.owin/Src/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]
3737
[assembly: InternalsVisibleTo("zipkin4net.middleware.owin.Tests")]

Src/zipkin4net.middleware.owin/Tests/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]

Src/zipkin4net/Src/zipkin4net.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -112,6 +112,7 @@
112112
<Compile Include="Tracers\Zipkin\ZipkinAnnotation.cs" />
113113
<Compile Include="Tracers\Zipkin\ZipkinAnnotationVisitor.cs" />
114114
<Compile Include="Tracers\Zipkin\ZipkinTracer.cs" />
115+
<Compile Include="Transport\Http\HttpZipkinSender.cs" />
115116
<Compile Include="Transport\ZipkinHttpHeaders.cs" />
116117
<Compile Include="Transport\ZipkinHttpTraceExtractor.cs" />
117118
<Compile Include="Transport\ZipkinHttpTraceInjector.cs" />
@@ -141,4 +142,4 @@
141142
<Target Name="AfterBuild">
142143
</Target>
143144
-->
144-
</Project>
145+
</Project>

0 commit comments

Comments
 (0)