.NET 8 Upgrade

opentracing-contrib · Nov 24, 2023 · d3525d2 · d3525d2
1 parent f64af79
commit d3525d2
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -16,6 +16,7 @@ build_script:
   - ps: .\dotnet-install.ps1 -Runtime dotnet -Version 3.1.10
   - ps: .\dotnet-install.ps1 -Version 6.0.100
   - ps: .\dotnet-install.ps1 -Version 7.0.100
+  - ps: .\dotnet-install.ps1 -Version 8.0.100
   - ps: .\build.ps1
 
 test: off

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ _**IMPORTANT:** OpenTracing and OpenCensus have merget to form **[OpenTelemetry]
 
 ## Supported .NET versions
 
-This project currently only supports apps targeting .NET Core 3.1, .NET 6.0, or .NET 7.0!
+This project currently only supports apps targeting .NET Core 3.1, .NET 6.0, .NET 7.0, or .NET 8.0!
 
 This project DOES NOT support the full .NET framework as that uses different instrumentation code.
 

diff --git a/...arks/OpenTracing.Contrib.NetCore.Benchmarks/OpenTracing.Contrib.NetCore.Benchmarks.csproj b/...arks/OpenTracing.Contrib.NetCore.Benchmarks/OpenTracing.Contrib.NetCore.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,6 +22,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.0,8)" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework)=='net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.0,9)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\OpenTracing.Contrib.NetCore\OpenTracing.Contrib.NetCore.csproj" />
   </ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
      "rollForward": "feature"
   }
 }
diff --git a/launch-sample.ps1 b/launch-sample.ps1
@@ -1,6 +1,6 @@
 [CmdletBinding(PositionalBinding = $false)]
 param(
-    [ValidateSet("net7.0", "net6.0", "netcoreapp3.1")]
+    [ValidateSet("net8.0", "net7.0", "net6.0", "netcoreapp3.1")]
     [string] $Framework = "net6.0"
 )
 

diff --git a/src/OpenTracing.Contrib.NetCore/OpenTracing.Contrib.NetCore.csproj b/src/OpenTracing.Contrib.NetCore/OpenTracing.Contrib.NetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <Description>Adds OpenTracing instrumentation for .NET Core apps that use the `Microsoft.Extensions.*` stack.
 Instrumented components: HttpClient calls, ASP.NET Core, Entity Framework Core and any other library that uses DiagnosticSource events.</Description>
     <PackageTags>opentracing;distributed-tracing;tracing;netcore</PackageTags>
@@ -65,4 +65,23 @@ Instrumented components: HttpClient calls, ASP.NET Core, Entity Framework Core a
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" PrivateAssets="All" />
   </ItemGroup>
 
+
+  <ItemGroup Condition="$(TargetFramework)=='net8.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+   <ItemGroup Condition="$(TargetFramework)=='net8.0'">
+    <!-- Main dependencies -->
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0,9)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0,9)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0,9)" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0,9)" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <!-- Instrumented libraries (which are not visible as actual dependencies) -->
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,9)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.0,9)" PrivateAssets="All" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/OpenTracing.Contrib.NetCore.Tests/OpenTracing.Contrib.NetCore.Tests.csproj b/test/OpenTracing.Contrib.NetCore.Tests/OpenTracing.Contrib.NetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,6 +27,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.0,8)" />
   </ItemGroup>
 
+
+  <ItemGroup Condition="$(TargetFramework)=='net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.0,9)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\OpenTracing.Contrib.NetCore\OpenTracing.Contrib.NetCore.csproj" />
   </ItemGroup>