Skip to content

Commit 981a516

Browse files
cwe1sscwe1ss
committed
Removes support for .NET EOL versions (.NET Core 2.1 & .NET 5.0);
Run tests & benchmarks on all frameworks
1 parent c97767d commit 981a516

File tree

82 files changed

+247
-2263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+247
-2263
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ environment:
1313

1414
build_script:
1515
- ps: Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile .\dotnet-install.ps1
16-
- ps: .\dotnet-install.ps1 -Runtime dotnet -Version 2.0.7 # Required for building the netcoreapp2.1 FrontendWeb (Razor throws an error otherwise)
17-
- ps: .\dotnet-install.ps1 -Runtime dotnet -Version 2.1.23
1816
- ps: .\dotnet-install.ps1 -Runtime dotnet -Version 3.1.10
19-
- ps: .\dotnet-install.ps1 -Runtime dotnet -Version 5.0.12
2017
- ps: .\dotnet-install.ps1 -Version 6.0.100
2118
- ps: .\dotnet-install.ps1 -Version 7.0.100
2219
- ps: .\build.ps1

‎OpenTracing.Contrib.sln

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{420F640A-E23
99
EndProjectSection
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F9AD8B6F-1F59-4678-B9CF-9CD87172A111}"
12-
ProjectSection(SolutionItems) = preProject
13-
test\Directory.Build.props = test\Directory.Build.props
14-
EndProjectSection
1512
EndProject
1613
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{36333C22-54F7-403C-ABC4-BECE4EE3F52D}"
1714
EndProject
@@ -34,18 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
3431
EndProject
3532
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracing.Contrib.NetCore.Benchmarks", "benchmarks\OpenTracing.Contrib.NetCore.Benchmarks\OpenTracing.Contrib.NetCore.Benchmarks.csproj", "{E92B106E-1DEF-43D9-B7FF-30132DB6254B}"
3633
EndProject
37-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp2.1", "netcoreapp2.1", "{EE82AECC-38E2-41E1-9154-5BE64E84591B}"
38-
EndProject
39-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "samples\netcoreapp2.1\Shared\Shared.csproj", "{552634BB-438A-4D09-8791-E7FE5709EE93}"
40-
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomersApi", "samples\netcoreapp2.1\CustomersApi\CustomersApi.csproj", "{079D77F1-F3C6-418C-9D90-D59C43DC9FE7}"
42-
EndProject
43-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrontendWeb", "samples\netcoreapp2.1\FrontendWeb\FrontendWeb.csproj", "{5322F598-2277-4123-9EA3-C34B965688FD}"
44-
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrdersApi", "samples\netcoreapp2.1\OrdersApi\OrdersApi.csproj", "{FF140251-51AF-4231-A751-4B398997F549}"
46-
EndProject
47-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrafficGenerator", "samples\netcoreapp2.1\TrafficGenerator\TrafficGenerator.csproj", "{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5}"
48-
EndProject
4934
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp3.1", "netcoreapp3.1", "{02A299C4-1D35-4A37-8258-A3DBEB76D9B0}"
5035
EndProject
5136
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "samples\netcoreapp3.1\Shared\Shared.csproj", "{D537C2F7-00F7-4C7B-8F79-95971C0F2019}"
@@ -58,18 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrdersApi", "samples\netcor
5843
EndProject
5944
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrafficGenerator", "samples\netcoreapp3.1\TrafficGenerator\TrafficGenerator.csproj", "{CE6A1977-11FB-4192-A533-BB31427B6DE2}"
6045
EndProject
61-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net5.0", "net5.0", "{064684F8-44D7-4151-81E0-79FCEF3EB744}"
62-
EndProject
63-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "samples\net5.0\Shared\Shared.csproj", "{F119757B-444F-4EC1-8CF3-A7196211CEE7}"
64-
EndProject
65-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomersApi", "samples\net5.0\CustomersApi\CustomersApi.csproj", "{7686CDB0-F47A-4809-B7F7-C9AFD2D43696}"
66-
EndProject
67-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FrontendWeb", "samples\net5.0\FrontendWeb\FrontendWeb.csproj", "{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9}"
68-
EndProject
69-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrdersApi", "samples\net5.0\OrdersApi\OrdersApi.csproj", "{9185D267-C28C-471E-80DF-9621F03FDF6B}"
70-
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrafficGenerator", "samples\net5.0\TrafficGenerator\TrafficGenerator.csproj", "{3369C8DF-DCC2-4934-BBA0-222BE6E5D649}"
72-
EndProject
7346
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net6.0", "net6.0", "{03935477-E35E-4EEE-9944-8742E0CB5CFD}"
7447
EndProject
7548
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomersApi", "samples\net6.0\CustomersApi\CustomersApi.csproj", "{872A3B2E-1A28-4B3C-A83D-7C99513B36FB}"
@@ -112,26 +85,6 @@ Global
11285
{E92B106E-1DEF-43D9-B7FF-30132DB6254B}.Debug|Any CPU.Build.0 = Debug|Any CPU
11386
{E92B106E-1DEF-43D9-B7FF-30132DB6254B}.Release|Any CPU.ActiveCfg = Release|Any CPU
11487
{E92B106E-1DEF-43D9-B7FF-30132DB6254B}.Release|Any CPU.Build.0 = Release|Any CPU
115-
{552634BB-438A-4D09-8791-E7FE5709EE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116-
{552634BB-438A-4D09-8791-E7FE5709EE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
117-
{552634BB-438A-4D09-8791-E7FE5709EE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
118-
{552634BB-438A-4D09-8791-E7FE5709EE93}.Release|Any CPU.Build.0 = Release|Any CPU
119-
{079D77F1-F3C6-418C-9D90-D59C43DC9FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120-
{079D77F1-F3C6-418C-9D90-D59C43DC9FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
121-
{079D77F1-F3C6-418C-9D90-D59C43DC9FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
122-
{079D77F1-F3C6-418C-9D90-D59C43DC9FE7}.Release|Any CPU.Build.0 = Release|Any CPU
123-
{5322F598-2277-4123-9EA3-C34B965688FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
124-
{5322F598-2277-4123-9EA3-C34B965688FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
125-
{5322F598-2277-4123-9EA3-C34B965688FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
126-
{5322F598-2277-4123-9EA3-C34B965688FD}.Release|Any CPU.Build.0 = Release|Any CPU
127-
{FF140251-51AF-4231-A751-4B398997F549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
128-
{FF140251-51AF-4231-A751-4B398997F549}.Debug|Any CPU.Build.0 = Debug|Any CPU
129-
{FF140251-51AF-4231-A751-4B398997F549}.Release|Any CPU.ActiveCfg = Release|Any CPU
130-
{FF140251-51AF-4231-A751-4B398997F549}.Release|Any CPU.Build.0 = Release|Any CPU
131-
{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
132-
{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
133-
{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
134-
{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5}.Release|Any CPU.Build.0 = Release|Any CPU
13588
{D537C2F7-00F7-4C7B-8F79-95971C0F2019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13689
{D537C2F7-00F7-4C7B-8F79-95971C0F2019}.Debug|Any CPU.Build.0 = Debug|Any CPU
13790
{D537C2F7-00F7-4C7B-8F79-95971C0F2019}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -152,26 +105,6 @@ Global
152105
{CE6A1977-11FB-4192-A533-BB31427B6DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
153106
{CE6A1977-11FB-4192-A533-BB31427B6DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
154107
{CE6A1977-11FB-4192-A533-BB31427B6DE2}.Release|Any CPU.Build.0 = Release|Any CPU
155-
{F119757B-444F-4EC1-8CF3-A7196211CEE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
156-
{F119757B-444F-4EC1-8CF3-A7196211CEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
157-
{F119757B-444F-4EC1-8CF3-A7196211CEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
158-
{F119757B-444F-4EC1-8CF3-A7196211CEE7}.Release|Any CPU.Build.0 = Release|Any CPU
159-
{7686CDB0-F47A-4809-B7F7-C9AFD2D43696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
160-
{7686CDB0-F47A-4809-B7F7-C9AFD2D43696}.Debug|Any CPU.Build.0 = Debug|Any CPU
161-
{7686CDB0-F47A-4809-B7F7-C9AFD2D43696}.Release|Any CPU.ActiveCfg = Release|Any CPU
162-
{7686CDB0-F47A-4809-B7F7-C9AFD2D43696}.Release|Any CPU.Build.0 = Release|Any CPU
163-
{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
164-
{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
165-
{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
166-
{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9}.Release|Any CPU.Build.0 = Release|Any CPU
167-
{9185D267-C28C-471E-80DF-9621F03FDF6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
168-
{9185D267-C28C-471E-80DF-9621F03FDF6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
169-
{9185D267-C28C-471E-80DF-9621F03FDF6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
170-
{9185D267-C28C-471E-80DF-9621F03FDF6B}.Release|Any CPU.Build.0 = Release|Any CPU
171-
{3369C8DF-DCC2-4934-BBA0-222BE6E5D649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172-
{3369C8DF-DCC2-4934-BBA0-222BE6E5D649}.Debug|Any CPU.Build.0 = Debug|Any CPU
173-
{3369C8DF-DCC2-4934-BBA0-222BE6E5D649}.Release|Any CPU.ActiveCfg = Release|Any CPU
174-
{3369C8DF-DCC2-4934-BBA0-222BE6E5D649}.Release|Any CPU.Build.0 = Release|Any CPU
175108
{872A3B2E-1A28-4B3C-A83D-7C99513B36FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
176109
{872A3B2E-1A28-4B3C-A83D-7C99513B36FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
177110
{872A3B2E-1A28-4B3C-A83D-7C99513B36FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -220,24 +153,12 @@ Global
220153
{10729E17-3C79-477B-BBEB-B727D7B5B60B} = {420F640A-E23F-457C-BEC7-1DEAD1C592F1}
221154
{70707714-F09D-48A7-B6BC-3C58B243A753} = {F9AD8B6F-1F59-4678-B9CF-9CD87172A111}
222155
{E92B106E-1DEF-43D9-B7FF-30132DB6254B} = {FCB84E77-6B0A-4969-8DF2-7E74197E29BB}
223-
{EE82AECC-38E2-41E1-9154-5BE64E84591B} = {36333C22-54F7-403C-ABC4-BECE4EE3F52D}
224-
{552634BB-438A-4D09-8791-E7FE5709EE93} = {EE82AECC-38E2-41E1-9154-5BE64E84591B}
225-
{079D77F1-F3C6-418C-9D90-D59C43DC9FE7} = {EE82AECC-38E2-41E1-9154-5BE64E84591B}
226-
{5322F598-2277-4123-9EA3-C34B965688FD} = {EE82AECC-38E2-41E1-9154-5BE64E84591B}
227-
{FF140251-51AF-4231-A751-4B398997F549} = {EE82AECC-38E2-41E1-9154-5BE64E84591B}
228-
{B7CFEC12-2A57-49D7-B4D6-3223A6018BB5} = {EE82AECC-38E2-41E1-9154-5BE64E84591B}
229156
{02A299C4-1D35-4A37-8258-A3DBEB76D9B0} = {36333C22-54F7-403C-ABC4-BECE4EE3F52D}
230157
{D537C2F7-00F7-4C7B-8F79-95971C0F2019} = {02A299C4-1D35-4A37-8258-A3DBEB76D9B0}
231158
{A3EB1F40-43D4-4917-A1C3-7102D183EFF8} = {02A299C4-1D35-4A37-8258-A3DBEB76D9B0}
232159
{1B474D5E-B041-4EB9-AA16-6980C26965F3} = {02A299C4-1D35-4A37-8258-A3DBEB76D9B0}
233160
{42CB5830-7366-421A-9588-D7B03CF2478E} = {02A299C4-1D35-4A37-8258-A3DBEB76D9B0}
234161
{CE6A1977-11FB-4192-A533-BB31427B6DE2} = {02A299C4-1D35-4A37-8258-A3DBEB76D9B0}
235-
{064684F8-44D7-4151-81E0-79FCEF3EB744} = {36333C22-54F7-403C-ABC4-BECE4EE3F52D}
236-
{F119757B-444F-4EC1-8CF3-A7196211CEE7} = {064684F8-44D7-4151-81E0-79FCEF3EB744}
237-
{7686CDB0-F47A-4809-B7F7-C9AFD2D43696} = {064684F8-44D7-4151-81E0-79FCEF3EB744}
238-
{E68B95C3-E0B4-489A-9FE9-3A46183D7AE9} = {064684F8-44D7-4151-81E0-79FCEF3EB744}
239-
{9185D267-C28C-471E-80DF-9621F03FDF6B} = {064684F8-44D7-4151-81E0-79FCEF3EB744}
240-
{3369C8DF-DCC2-4934-BBA0-222BE6E5D649} = {064684F8-44D7-4151-81E0-79FCEF3EB744}
241162
{03935477-E35E-4EEE-9944-8742E0CB5CFD} = {36333C22-54F7-403C-ABC4-BECE4EE3F52D}
242163
{872A3B2E-1A28-4B3C-A83D-7C99513B36FB} = {03935477-E35E-4EEE-9944-8742E0CB5CFD}
243164
{4756D99B-BAA2-4B9E-AAE3-F521C38134DD} = {03935477-E35E-4EEE-9944-8742E0CB5CFD}

‎benchmarks/OpenTracing.Contrib.NetCore.Benchmarks/AspNetCore/RequestDiagnosticsBenchmark.cs

Lines changed: 53 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,87 @@
11
using System;
2-
using System.Diagnostics;
2+
using System.Net.Http;
33
using System.Threading.Tasks;
44
using BenchmarkDotNet.Attributes;
5-
using Microsoft.AspNetCore.Hosting.Internal;
5+
using Microsoft.AspNetCore;
6+
using Microsoft.AspNetCore.Builder;
7+
using Microsoft.AspNetCore.Hosting;
68
using Microsoft.AspNetCore.Http;
7-
using Microsoft.AspNetCore.Http.Features;
9+
using Microsoft.AspNetCore.Mvc.Testing;
810
using Microsoft.Extensions.DependencyInjection;
911
using Microsoft.Extensions.Logging;
10-
using NSubstitute;
11-
using OpenTracing.Contrib.NetCore.Internal;
1212

1313
namespace OpenTracing.Contrib.NetCore.Benchmarks.AspNetCore
1414
{
15+
public class TestProgramFactory : WebApplicationFactory<TestProgramFactory>
16+
{
17+
protected override IWebHostBuilder CreateWebHostBuilder()
18+
{
19+
var host = WebHost.CreateDefaultBuilder()
20+
// https://stackoverflow.com/a/69776251/5214796
21+
.UseSetting("TEST_CONTENTROOT_OPENTRACING_CONTRIB_NETCORE_TESTS", "")
22+
.ConfigureServices(services =>
23+
{
24+
})
25+
.Configure(app =>
26+
{
27+
app.UseRouting();
28+
app.UseEndpoints(endpoints =>
29+
{
30+
endpoints.MapGet("/foo", async context =>
31+
{
32+
await context.Response.WriteAsync("Hello");
33+
});
34+
35+
endpoints.MapGet("/exception", _ =>
36+
{
37+
throw new InvalidOperationException("You shall not pass");
38+
});
39+
});
40+
});
41+
42+
return host;
43+
}
44+
}
45+
1546
public class RequestDiagnosticsBenchmark
1647
{
17-
private IServiceProvider _serviceProvider;
18-
private FeatureCollection _features;
19-
private HostingApplication _hostingApplication;
20-
private DefaultHttpContext _httpContext;
48+
private WebApplicationFactory<TestProgramFactory> _factory;
49+
private HttpClient _client;
2150

2251
[Params(InstrumentationMode.None, InstrumentationMode.Noop, InstrumentationMode.Mock)]
2352
public InstrumentationMode Mode { get; set; }
2453

2554
[GlobalSetup]
2655
public void GlobalSetup()
2756
{
28-
_serviceProvider = new ServiceCollection()
29-
.AddLogging()
30-
.AddOpenTracingCoreServices(builder =>
57+
_factory = new TestProgramFactory()
58+
.WithWebHostBuilder(x =>
3159
{
32-
builder.AddAspNetCore();
33-
builder.AddBenchmarkTracer(Mode);
34-
})
35-
.BuildServiceProvider();
36-
37-
var diagnosticManager = _serviceProvider.GetRequiredService<DiagnosticManager>();
38-
diagnosticManager.Start();
39-
40-
// Request
41-
42-
_httpContext = new DefaultHttpContext();
43-
var request = _httpContext.Request;
44-
45-
Uri requestUri = new Uri("http://www.example.com/foo");
46-
47-
request.Protocol = "HTTP/1.1";
48-
request.Method = HttpMethods.Get;
49-
request.Scheme = requestUri.Scheme;
50-
request.Host = HostString.FromUriComponent(requestUri);
51-
if (requestUri.IsDefaultPort)
52-
{
53-
request.Host = new HostString(request.Host.Host);
54-
}
55-
request.PathBase = PathString.Empty;
56-
request.Path = PathString.FromUriComponent(requestUri);
57-
request.QueryString = QueryString.FromUriComponent(requestUri);
58-
59-
// Hosting Application
60-
61-
var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
62-
63-
_features = new FeatureCollection();
64-
_features.Set<IHttpRequestFeature>(new HttpRequestFeature());
60+
x.ConfigureLogging(l => l.ClearProviders());
6561

66-
var httpContextFactory = Substitute.For<IHttpContextFactory>();
67-
httpContextFactory.Create(_features).Returns(_httpContext);
62+
x.ConfigureServices(services =>
63+
{
64+
services.AddOpenTracingCoreServices(builder =>
65+
{
66+
builder.AddAspNetCore();
67+
builder.AddBenchmarkTracer(Mode);
68+
});
69+
});
70+
});
6871

69-
_hostingApplication = new HostingApplication(
70-
ctx => Task.FromResult(0),
71-
_serviceProvider.GetRequiredService<ILogger<RequestDiagnosticsBenchmark>>(),
72-
diagnosticSource,
73-
httpContextFactory);
72+
_client = _factory.CreateClient();
7473
}
7574

7675
[GlobalCleanup]
7776
public void GlobalCleanup()
7877
{
79-
(_serviceProvider as IDisposable).Dispose();
78+
_factory.Dispose();
8079
}
8180

8281
[Benchmark]
8382
public async Task GetAsync()
8483
{
85-
var context = _hostingApplication.CreateContext(_features);
86-
await _hostingApplication.ProcessRequestAsync(context);
87-
_hostingApplication.DisposeContext(context, null);
84+
await _client.GetAsync("/foo");
8885
}
8986
}
9087
}

‎benchmarks/OpenTracing.Contrib.NetCore.Benchmarks/OpenTracing.Contrib.NetCore.Benchmarks.csproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
1010
<PackageReference Include="NSubstitute" Version="4.2.2" />
1111
</ItemGroup>
1212

@@ -19,6 +19,18 @@
1919
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
2020
</ItemGroup>
2121

22+
<ItemGroup Condition="$(TargetFramework)=='netcoreapp3.1'">
23+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[3.1.31,4)" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition="$(TargetFramework)=='net6.0'">
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.11,7)" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="$(TargetFramework)=='net7.0'">
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.0,8)" />
32+
</ItemGroup>
33+
2234
<ItemGroup>
2335
<ProjectReference Include="..\..\src\OpenTracing.Contrib.NetCore\OpenTracing.Contrib.NetCore.csproj" />
2436
</ItemGroup>

‎launch-sample.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[CmdletBinding(PositionalBinding = $false)]
22
param(
3-
[ValidateSet("net7.0", "net6.0", "net5.0", "netcoreapp3.1", "netcoreapp2.1")]
3+
[ValidateSet("net7.0", "net6.0", "netcoreapp3.1")]
44
[string] $Framework = "net6.0"
55
)
66

‎samples/net5.0/CustomersApi/Controllers/CustomersController.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎samples/net5.0/CustomersApi/CustomersApi.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)