diff --git a/global.json b/global.json index a1d9a8f..5cc706b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.102" + "version": "3.1.301" } -} \ No newline at end of file +} diff --git a/src/Clients/AspNetCore.FunctionalTest/AspNetCore.FunctionalTest.csproj b/src/Clients/AspNetCore.FunctionalTest/AspNetCore.FunctionalTest.csproj index 7630878..486603f 100644 --- a/src/Clients/AspNetCore.FunctionalTest/AspNetCore.FunctionalTest.csproj +++ b/src/Clients/AspNetCore.FunctionalTest/AspNetCore.FunctionalTest.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -19,6 +19,7 @@ + diff --git a/src/Clients/AspNetCore.Tests/AspNetCore.Tests.csproj b/src/Clients/AspNetCore.Tests/AspNetCore.Tests.csproj index 45bb686..65e4c56 100644 --- a/src/Clients/AspNetCore.Tests/AspNetCore.Tests.csproj +++ b/src/Clients/AspNetCore.Tests/AspNetCore.Tests.csproj @@ -1,24 +1,24 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Hosting.AspNetCore.Tests Thor.Hosting.AspNetCore.Tests true - - + + all runtime; build; native; contentfiles; analyzers - - - - + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Clients/AspNetCore.Tests/ServiceCollectionExtensionsTests.cs b/src/Clients/AspNetCore.Tests/ServiceCollectionExtensionsTests.cs index 3bd6023..c1d977c 100644 --- a/src/Clients/AspNetCore.Tests/ServiceCollectionExtensionsTests.cs +++ b/src/Clients/AspNetCore.Tests/ServiceCollectionExtensionsTests.cs @@ -1,7 +1,8 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Moq; using Xunit; @@ -18,7 +19,7 @@ public void AddTracing() // arrange IServiceCollection services = new ServiceCollection(); IConfigurationBuilder builder = new ConfigurationBuilder(); - Mock appLifetime = new Mock(); + Mock appLifetime = new Mock(); Dictionary data = new Dictionary { {"Tracing:ApplicationId", "5"}, @@ -43,4 +44,4 @@ public void AddTracing() #endregion } -} \ No newline at end of file +} diff --git a/src/Clients/AspNetCore/AspNetCore.csproj b/src/Clients/AspNetCore/AspNetCore.csproj index 662c29d..9111132 100644 --- a/src/Clients/AspNetCore/AspNetCore.csproj +++ b/src/Clients/AspNetCore/AspNetCore.csproj @@ -1,26 +1,19 @@ - + - netstandard2.0;netcoreapp3.0 + netcoreapp3.1 Thor.AspNetCore Thor.Hosting.AspNetCore Thor.Hosting.AspNetCore true - Provides tracing capabilities for AspNet core 2.0 and higher. + Provides tracing capabilities for ASP.NET Core. bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml true - - - - - - - - + - + diff --git a/src/Clients/AspNetCore/TracingStartupFilter.cs b/src/Clients/AspNetCore/TracingStartupFilter.cs index 1290e13..2b3ca34 100644 --- a/src/Clients/AspNetCore/TracingStartupFilter.cs +++ b/src/Clients/AspNetCore/TracingStartupFilter.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Thor.Core; using Thor.Core.Session.Abstractions; using Thor.Core.Transmission.Abstractions; @@ -27,7 +28,7 @@ public class TracingStartupFilter /// An attachment transmission initializer. /// An optional telemetry event session. public TracingStartupFilter( - IApplicationLifetime applicationLifetime, + IHostApplicationLifetime applicationLifetime, TracingConfiguration options, IAttachmentTransmissionInitializer initializer, ITelemetrySession session) diff --git a/src/Clients/GenericHost.Sample/GenericHost.Sample.csproj b/src/Clients/GenericHost.Sample/GenericHost.Sample.csproj index ed240cd..447785a 100644 --- a/src/Clients/GenericHost.Sample/GenericHost.Sample.csproj +++ b/src/Clients/GenericHost.Sample/GenericHost.Sample.csproj @@ -1,17 +1,17 @@ - + Exe - netcoreapp3.0 + netcoreapp3.1 Thor.Hosting.GenericHost.FunctionalTest Thor.Hosting.GenericHost.FunctionalTest - - + + - + diff --git a/src/Clients/GenericHost.Tests/GenericHost.Tests.csproj b/src/Clients/GenericHost.Tests/GenericHost.Tests.csproj index 3dde18b..42728ff 100644 --- a/src/Clients/GenericHost.Tests/GenericHost.Tests.csproj +++ b/src/Clients/GenericHost.Tests/GenericHost.Tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.0 + netcoreapp3.1 Thor.Hosting.GenericHost.Tests Thor.Hosting.GenericHost.Tests true @@ -9,14 +9,14 @@ - - - - - - + + + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Clients/GenericHost/GenericHost.csproj b/src/Clients/GenericHost/GenericHost.csproj index 644c502..447fb8e 100644 --- a/src/Clients/GenericHost/GenericHost.csproj +++ b/src/Clients/GenericHost/GenericHost.csproj @@ -1,24 +1,18 @@ - + - netstandard2.0;netcoreapp3.0 + netcoreapp3.1 Thor.GenericHost Thor.Hosting.GenericHost Thor.Hosting.GenericHost true - Provides tracing capabilities for GenericHost core 2.0 and higher. + Provides tracing capabilities for GenericHost. bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml true - - - - - - - - + + diff --git a/src/Clients/GenericHost/HostBuilderExtensions.cs b/src/Clients/GenericHost/HostBuilderExtensions.cs index ec6937b..44d61c3 100644 --- a/src/Clients/GenericHost/HostBuilderExtensions.cs +++ b/src/Clients/GenericHost/HostBuilderExtensions.cs @@ -19,7 +19,7 @@ public static class HostBuilderExtensions builder.AddTracing(context.Configuration)) .Build(); - var hostTelemetryInitializer = host.Services + HostTelemetryInitializer hostTelemetryInitializer = host.Services .GetService(); hostTelemetryInitializer?.Initialize(); diff --git a/src/Clients/GenericHost/HostTelemetryInitializer.cs b/src/Clients/GenericHost/HostTelemetryInitializer.cs index bbecef7..279730a 100644 --- a/src/Clients/GenericHost/HostTelemetryInitializer.cs +++ b/src/Clients/GenericHost/HostTelemetryInitializer.cs @@ -8,13 +8,13 @@ namespace Thor.Hosting.GenericHost { internal class HostTelemetryInitializer { - private readonly IApplicationLifetime _applicationLifetime; + private readonly IHostApplicationLifetime _applicationLifetime; private readonly ITelemetrySession _session; private readonly IAttachmentTransmissionInitializer _initializer; private readonly TracingConfiguration _options; public HostTelemetryInitializer( - IApplicationLifetime applicationLifetime, + IHostApplicationLifetime applicationLifetime, ITelemetrySession session, IAttachmentTransmissionInitializer initializer, TracingConfiguration options) diff --git a/src/Clients/Hosting.Tests/Hosting.Tests.csproj b/src/Clients/Hosting.Tests/Hosting.Tests.csproj index 1fab350..e6adb5b 100644 --- a/src/Clients/Hosting.Tests/Hosting.Tests.csproj +++ b/src/Clients/Hosting.Tests/Hosting.Tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.0 + netcoreapp3.1 Thor.Extensions.Hosting.Tests Thor.Extensions.Hosting.Tests true @@ -9,19 +9,19 @@ - + all runtime; build; native; contentfiles; analyzers - - - - - - + + + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Clients/Hosting/Hosting.csproj b/src/Clients/Hosting/Hosting.csproj index 4dd0885..dce804b 100644 --- a/src/Clients/Hosting/Hosting.csproj +++ b/src/Clients/Hosting/Hosting.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0 + netcoreapp3.1 Thor.Extensions.Hosting Thor.Extensions.Hosting Thor.Extensions.Hosting @@ -11,12 +11,8 @@ true - - - - - - + + diff --git a/src/Clients/HotChocolate.Tests/HotChocolate.Tests.csproj b/src/Clients/HotChocolate.Tests/HotChocolate.Tests.csproj index 9904d29..7966d1d 100644 --- a/src/Clients/HotChocolate.Tests/HotChocolate.Tests.csproj +++ b/src/Clients/HotChocolate.Tests/HotChocolate.Tests.csproj @@ -1,26 +1,26 @@ - + - netcoreapp3.0 + netcoreapp3.1 Thor.Extensions.HotChocolate.Tests Thor.Extensions.HotChocolate.Tests true - - + + all runtime; build; native; contentfiles; analyzers - - - - + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Clients/HotChocolate/HotChocolate.csproj b/src/Clients/HotChocolate/HotChocolate.csproj index b0f4f67..3820dcf 100644 --- a/src/Clients/HotChocolate/HotChocolate.csproj +++ b/src/Clients/HotChocolate/HotChocolate.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0 + netcoreapp3.1 Thor.HotChocolate Thor.Extensions.HotChocolate Thor.Extensions.HotChocolate @@ -12,15 +12,8 @@ - - - - - - - - + diff --git a/src/Clients/Http.FunctionalTest/Http.FunctionalTest.csproj b/src/Clients/Http.FunctionalTest/Http.FunctionalTest.csproj index f43309a..346db29 100644 --- a/src/Clients/Http.FunctionalTest/Http.FunctionalTest.csproj +++ b/src/Clients/Http.FunctionalTest/Http.FunctionalTest.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.0 + netcoreapp3.1 Thor.Extensions.Http.FunctionalTest Thor.Extensions.Http.FunctionalTest @@ -14,6 +14,10 @@ + + + + diff --git a/src/Clients/Http.FunctionalTest/Startup.cs b/src/Clients/Http.FunctionalTest/Startup.cs index 7f3b649..4de8409 100644 --- a/src/Clients/Http.FunctionalTest/Startup.cs +++ b/src/Clients/Http.FunctionalTest/Startup.cs @@ -1,7 +1,8 @@ -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; namespace Thor.Extensions.Http.FunctionalTest { @@ -23,7 +24,7 @@ public void ConfigureServices(IServiceCollection services) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { if (env.IsDevelopment()) { @@ -33,4 +34,4 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseMvc(); } } -} \ No newline at end of file +} diff --git a/src/Clients/Http.Tests/Http.Tests.csproj b/src/Clients/Http.Tests/Http.Tests.csproj index fd665fd..24f34e3 100644 --- a/src/Clients/Http.Tests/Http.Tests.csproj +++ b/src/Clients/Http.Tests/Http.Tests.csproj @@ -1,23 +1,26 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Extensions.Http.Tests Thor.Extensions.Http.Tests true - + all runtime; build; native; contentfiles; analyzers - - - - + + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Clients/Http/Http.csproj b/src/Clients/Http/Http.csproj index a508323..93dc94e 100644 --- a/src/Clients/Http/Http.csproj +++ b/src/Clients/Http/Http.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Http Thor.Extensions.Http Thor.Extensions.Http @@ -11,12 +11,8 @@ true - - - - - - + + diff --git a/src/Core/Core.Abstractions.Tests/Core.Abstractions.Tests.csproj b/src/Core/Core.Abstractions.Tests/Core.Abstractions.Tests.csproj index 3e9b89c..3811ead 100644 --- a/src/Core/Core.Abstractions.Tests/Core.Abstractions.Tests.csproj +++ b/src/Core/Core.Abstractions.Tests/Core.Abstractions.Tests.csproj @@ -1,23 +1,26 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Abstractions.Tests Thor.Core.Abstractions.Tests true - + all runtime; build; native; contentfiles; analyzers - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Core.Abstractions/Core.Abstractions.csproj b/src/Core/Core.Abstractions/Core.Abstractions.csproj index 94a1e39..e44ecef 100644 --- a/src/Core/Core.Abstractions/Core.Abstractions.csproj +++ b/src/Core/Core.Abstractions/Core.Abstractions.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Abstractions Thor.Core.Abstractions Thor.Core.Abstractions @@ -12,7 +12,7 @@ - + diff --git a/src/Core/Core.Tests/Core.Tests.csproj b/src/Core/Core.Tests/Core.Tests.csproj index 84d81ed..5e06370 100644 --- a/src/Core/Core.Tests/Core.Tests.csproj +++ b/src/Core/Core.Tests/Core.Tests.csproj @@ -1,24 +1,27 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Tests Thor.Core.Tests true - + all runtime; build; native; contentfiles; analyzers - + - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Core/Core.csproj b/src/Core/Core/Core.csproj index c938821..6344cc6 100644 --- a/src/Core/Core/Core.csproj +++ b/src/Core/Core/Core.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core Thor.Core Thor.Core @@ -11,20 +11,12 @@ true - - - - - - - - - - - - - - + + + + + + diff --git a/src/Core/Custom.EventSources.Tests/Custom.EventSources.Tests.csproj b/src/Core/Custom.EventSources.Tests/Custom.EventSources.Tests.csproj index e9db402..81f6058 100644 --- a/src/Core/Custom.EventSources.Tests/Custom.EventSources.Tests.csproj +++ b/src/Core/Custom.EventSources.Tests/Custom.EventSources.Tests.csproj @@ -1,24 +1,27 @@  - netcoreapp3.0 + netcoreapp3.1 Custom.EventSources.Tests SwissLife.Tracing.Core.Session.Tests true - + all runtime; build; native; contentfiles; analyzers - + - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Custom.EventSources/Custom.EventSources.csproj b/src/Core/Custom.EventSources/Custom.EventSources.csproj index 0a0de3f..15046ff 100644 --- a/src/Core/Custom.EventSources/Custom.EventSources.csproj +++ b/src/Core/Custom.EventSources/Custom.EventSources.csproj @@ -1,14 +1,7 @@  - netstandard2.0;netcoreapp3.0 - - - - true - - - + netstandard2.0 true diff --git a/src/Core/Session.Abstractions.Tests/Session.Abstractions.Tests.csproj b/src/Core/Session.Abstractions.Tests/Session.Abstractions.Tests.csproj index 7c5f70a..ec48f3d 100644 --- a/src/Core/Session.Abstractions.Tests/Session.Abstractions.Tests.csproj +++ b/src/Core/Session.Abstractions.Tests/Session.Abstractions.Tests.csproj @@ -1,23 +1,26 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Session.Abstractions.Tests Thor.Core.Session.Abstractions.Tests true - + all runtime; build; native; contentfiles; analyzers - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Session.Abstractions/Session.Abstractions.csproj b/src/Core/Session.Abstractions/Session.Abstractions.csproj index 6f77653..f80b350 100644 --- a/src/Core/Session.Abstractions/Session.Abstractions.csproj +++ b/src/Core/Session.Abstractions/Session.Abstractions.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Session.Abstractions Thor.Core.Session.Abstractions Thor.Core.Session.Abstractions diff --git a/src/Core/Session.Tests/Session.Tests.csproj b/src/Core/Session.Tests/Session.Tests.csproj index 4410418..43f44b7 100644 --- a/src/Core/Session.Tests/Session.Tests.csproj +++ b/src/Core/Session.Tests/Session.Tests.csproj @@ -1,24 +1,27 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Session.Tests Thor.Core.Session.Tests true - + all runtime; build; native; contentfiles; analyzers - + - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Session/Session.csproj b/src/Core/Session/Session.csproj index d7a0af2..6f251ce 100644 --- a/src/Core/Session/Session.csproj +++ b/src/Core/Session/Session.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Session Thor.Core.Session Thor.Core.Session @@ -11,14 +11,8 @@ true - - - - - - - - + + diff --git a/src/Core/Transmission.Abstractions.Tests/Transmission.Abstractions.Tests.csproj b/src/Core/Transmission.Abstractions.Tests/Transmission.Abstractions.Tests.csproj index 88214e8..235d879 100644 --- a/src/Core/Transmission.Abstractions.Tests/Transmission.Abstractions.Tests.csproj +++ b/src/Core/Transmission.Abstractions.Tests/Transmission.Abstractions.Tests.csproj @@ -1,23 +1,26 @@  - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Transmission.Abstractions.Tests Thor.Core.Transmission.Abstractions.Tests true - + all runtime; build; native; contentfiles; analyzers - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Transmission.Abstractions/Transmission.Abstractions.csproj b/src/Core/Transmission.Abstractions/Transmission.Abstractions.csproj index 70b00e5..01478b7 100644 --- a/src/Core/Transmission.Abstractions/Transmission.Abstractions.csproj +++ b/src/Core/Transmission.Abstractions/Transmission.Abstractions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;;netcoreapp3.0;netcoreapp3.1 + netstandard2.0 Thor.Core.Transmission.Abstractions Thor.Core.Transmission.Abstractions Thor.Core.Transmission.Abstractions @@ -13,7 +13,7 @@ - + diff --git a/src/Core/Transmission.BlobStorage.Tests/Transmission.BlobStorage.Tests.csproj b/src/Core/Transmission.BlobStorage.Tests/Transmission.BlobStorage.Tests.csproj index ef76ed1..5eb1365 100644 --- a/src/Core/Transmission.BlobStorage.Tests/Transmission.BlobStorage.Tests.csproj +++ b/src/Core/Transmission.BlobStorage.Tests/Transmission.BlobStorage.Tests.csproj @@ -1,23 +1,26 @@ - netcoreapp3.0 + netcoreapp3.1 Thor.Core.Transmission.BlobStorage.Tests Thor.Core.Transmission.BlobStorage.Tests true - + all runtime; build; native; contentfiles; analyzers - + - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Transmission.BlobStorage/Transmission.BlobStorage.csproj b/src/Core/Transmission.BlobStorage/Transmission.BlobStorage.csproj index bd65c59..1f6af8d 100644 --- a/src/Core/Transmission.BlobStorage/Transmission.BlobStorage.csproj +++ b/src/Core/Transmission.BlobStorage/Transmission.BlobStorage.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Transmission.BlobStorage Thor.Core.Transmission.BlobStorage Thor.Core.Transmission.BlobStorage @@ -11,22 +11,10 @@ true - - - - - - + + - - - - - - - - diff --git a/src/Core/Transmission.EventHub.Tests/Transmission.EventHub.Tests.csproj b/src/Core/Transmission.EventHub.Tests/Transmission.EventHub.Tests.csproj index 5cf1b4a..82f1d8c 100644 --- a/src/Core/Transmission.EventHub.Tests/Transmission.EventHub.Tests.csproj +++ b/src/Core/Transmission.EventHub.Tests/Transmission.EventHub.Tests.csproj @@ -1,25 +1,27 @@ - netcoreapp3.0 - + netcoreapp3.1 Thor.Core.Transmission.EventHub.Tests Thor.Core.Transmission.EventHub.Tests true - + all runtime; build; native; contentfiles; analyzers - + - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Core/Transmission.EventHub/Transmission.EventHub.csproj b/src/Core/Transmission.EventHub/Transmission.EventHub.csproj index f88009f..6fc00cc 100644 --- a/src/Core/Transmission.EventHub/Transmission.EventHub.csproj +++ b/src/Core/Transmission.EventHub/Transmission.EventHub.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;netcoreapp3.0 + netstandard2.0 Thor.Core.Transmission.EventHub Thor.Core.Transmission.EventHub Thor.Core.Transmission.EventHub @@ -11,20 +11,8 @@ true - - - - - - - - - - - - - - + + diff --git a/src/Package.props b/src/Package.props index 4bc28b6..5c43585 100644 --- a/src/Package.props +++ b/src/Package.props @@ -17,13 +17,14 @@ true true true + true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb 8.0 false - + diff --git a/src/Settings.props b/src/Settings.props index a46676d..0d3cb4e 100644 --- a/src/Settings.props +++ b/src/Settings.props @@ -1,13 +1,5 @@ - - 7.2 - - - - 8.0 - - Full true