Skip to content

Commit 3157dfb

Browse files
CZEMacLeodCZEMacLeod
committed
Update OpenTelemetry versions
1 parent 315186b commit 3157dfb

File tree

7 files changed

+40
-36
lines changed

7 files changed

+40
-36
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1515
</ItemGroup>
1616

17+
<PropertyGroup>
18+
<OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
19+
<OpenTelemetryBetaVersion>1.12.0-beta.1</OpenTelemetryBetaVersion>
20+
</PropertyGroup>
21+
1722
<!-- Suppress APIRE004 warning by setting _IsExecutable to true in MSBuild.SDK.SystemWeb based projects -->
1823
<!-- TODO: Investigate if we can just set that to true and what effect that might have -->
1924
<Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework" /> <!-- Ensure target exists for non net projects -->

‎samples/EF6/EF6/EF6WebApp.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535

3636
<PackageReference Include="Microsoft.EntityFramework.SqlServer" Version="6.5.1" />
3737

38-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
39-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
38+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
39+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
4040

41-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
42-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
41+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
42+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
4343

44-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.11.0-beta.2" />
45-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />
44+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="$(OpenTelemetryBetaVersion)" />
45+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="$(OpenTelemetryBetaVersion)" />
4646
</ItemGroup>
4747
<ItemGroup>
4848
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

‎samples/Legacy/LegacyWebApplication/LegacyWebApplication.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
<PackageReference Include="Google.Protobuf" Version="3.30.2" />
207207
<PackageReference Include="Grpc" Version="2.46.6" />
208208
<PackageReference Include="Grpc.Core" Version="2.46.6" />
209-
<PackageReference Include="Grpc.Core.Api" Version="2.70.0" />
209+
<PackageReference Include="Grpc.Core.Api" Version="2.71.0" />
210210
<PackageReference Include="jQuery" Version="3.7.1" />
211211
<PackageReference Include="jQuery.Validation" Version="1.21.0" />
212212
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
@@ -233,15 +233,15 @@
233233
<PackageReference Include="Microsoft.Web.Infrastructure" Version="2.0.0" />
234234
<PackageReference Include="Modernizr" Version="2.8.3" />
235235
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
236-
<PackageReference Include="OpenTelemetry" Version="1.11.2" />
237-
<PackageReference Include="OpenTelemetry.Api" Version="1.11.2" />
238-
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" Version="1.11.2" />
239-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
240-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
241-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.11.0-beta.2" />
242-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />
243-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
244-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
236+
<PackageReference Include="OpenTelemetry" Version="1.12.0" />
237+
<PackageReference Include="OpenTelemetry.Api" Version="1.12.0" />
238+
<PackageReference Include="OpenTelemetry.Api.ProviderBuilderExtensions" Version="1.12.0" />
239+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
240+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
241+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.12.0-beta.1" />
242+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.12.0-beta.1" />
243+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
244+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
245245
<PackageReference Include="System.Buffers" Version="4.6.1" />
246246
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.4" />
247247
<PackageReference Include="System.Memory" Version="4.6.3" />

‎samples/SWA/SWAFramework/SWAFramework.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
</ItemGroup>
3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.Configuration.ConfigurationBuilders.Environment" Version="3.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
36+
3537
<PackageReference Include="routedebugger" Version="2.1.5" />
3638

3739
</ItemGroup>
@@ -40,19 +42,19 @@
4042
<PackageReference Include="Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices" Version="2.0.0" />
4143
</ItemGroup>
4244
<ItemGroup Label="OpenTelemetry">
43-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
45+
<ProjectReference Include="..\..\..\src\C3D\Extensions\SystemWeb\OpenTelemetry\Application\C3D.Extensions.SystemWeb.OpenTelemetry.Application.csproj" />
46+
<!--<PackageReference Include="Grpc.Core" Version="2.46.6" />-->
4447

45-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
46-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
47-
<PackageReference Include="Grpc.Core" Version="2.46.6" />
48+
<!--<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
49+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />-->
4850

49-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
51+
<!--<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
5052
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
5153
5254
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.11.0-beta.2" />
53-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />
55+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />-->
5456

55-
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.11.0-beta.2" />
57+
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="$(OpenTelemetryBetaVersion)" />
5658
</ItemGroup>
5759

5860
<ItemGroup>
@@ -67,7 +69,6 @@
6769
</ItemGroup>
6870

6971
<ItemGroup>
70-
<ProjectReference Include="..\..\..\src\C3D\Extensions\SystemWeb\OpenTelemetry\Application\C3D.Extensions.SystemWeb.OpenTelemetry.Application.csproj" />
7172
<ProjectReference Include="..\SWALibrary\SWALibrary.csproj" />
7273
</ItemGroup>
7374

‎samples/Simple/SimpleMVC/SimpleMVC.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
<ItemGroup Label="OpenTelemetry">
3232
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
3333

34-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
35-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
34+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
35+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
3636
<PackageReference Include="Grpc.Core" Version="2.46.6" />
3737

38-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
39-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
38+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
39+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
4040

41-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.11.0-beta.2" />
42-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="1.11.0-beta.2" />
41+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="$(OpenTelemetryBetaVersion)" />
42+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule" Version="$(OpenTelemetryBetaVersion)" />
4343
</ItemGroup>
4444
<ItemGroup>
4545
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

‎src/C3D/Extensions/SystemWeb/OpenTelemetry/Application/C3D.Extensions.SystemWeb.OpenTelemetry.Application.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
<AssemblyTitle>$(AssemblyTitle) System.Web OpenTelemetry HttpApplication</AssemblyTitle>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
11-
<OpenTelemetryBetaVersion>1.12.0-beta.1</OpenTelemetryBetaVersion>
12-
</PropertyGroup>
9+
1310

1411
<ItemGroup Label="OpenTelemetry">
1512
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />

‎src/C3D/Extensions/SystemWeb/OpenTelemetry/Application/version.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
"version": "0.1",
44
"pathFilters": [
55
".",
6-
"../Directory.Build.props",
7-
"../Directory.Build.targets"
6+
"../../../Directory.Build.props",
7+
"../../../Directory.Build.targets",
8+
"../../../../../../Directory.Build.props"
89
],
910
//"publicReleaseRefSpec": [
1011
// "^refs/heads/main$", // we release out of main

0 commit comments

Comments
 (0)