diff --git a/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj b/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj index 9c6205c4e..70097695b 100644 --- a/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj +++ b/sandbox/BlazorWasm/Client/BlazorWasm.Client.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 enable enable false - - + + diff --git a/sandbox/BlazorWasm/Client/Program.cs b/sandbox/BlazorWasm/Client/Program.cs index 9f004ae3d..50192aeb1 100644 --- a/sandbox/BlazorWasm/Client/Program.cs +++ b/sandbox/BlazorWasm/Client/Program.cs @@ -12,7 +12,7 @@ builder.Services.AddNats(configureOpts: opt => opt with { SerializerRegistry = NatsJsonSerializerRegistry.Default, - Url = "ws://localhost:8080", + Url = "ws://localhost:4280", Name = "BlazorClient", }); diff --git a/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj b/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj index 5ec643823..4e356f4fb 100644 --- a/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj +++ b/sandbox/BlazorWasm/Server/BlazorWasm.Server.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable false @@ -9,7 +9,7 @@ - + diff --git a/sandbox/BlazorWasm/Server/NatsServices/WeatherForecastService.cs b/sandbox/BlazorWasm/Server/NatsServices/WeatherForecastService.cs index 6ee0198f4..35c2287da 100644 --- a/sandbox/BlazorWasm/Server/NatsServices/WeatherForecastService.cs +++ b/sandbox/BlazorWasm/Server/NatsServices/WeatherForecastService.cs @@ -24,6 +24,7 @@ public WeatherForecastService(ILogger logger, INatsConne public Task StartAsync(CancellationToken cancellationToken) { _cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + cancellationToken = _cts.Token; _replyTask = Task.Run( async () => { diff --git a/sandbox/BlazorWasm/Shared/BlazorWasm.Shared.csproj b/sandbox/BlazorWasm/Shared/BlazorWasm.Shared.csproj index 840ddf4ff..886e77af3 100644 --- a/sandbox/BlazorWasm/Shared/BlazorWasm.Shared.csproj +++ b/sandbox/BlazorWasm/Shared/BlazorWasm.Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable false diff --git a/sandbox/ConsoleApp/ConsoleApp.csproj b/sandbox/ConsoleApp/ConsoleApp.csproj index 769476a80..8acc36357 100644 --- a/sandbox/ConsoleApp/ConsoleApp.csproj +++ b/sandbox/ConsoleApp/ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable $(NoWarn);CS8002 @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/sandbox/ConsoleApp/Program.cs b/sandbox/ConsoleApp/Program.cs index e3577bda9..d54114029 100644 --- a/sandbox/ConsoleApp/Program.cs +++ b/sandbox/ConsoleApp/Program.cs @@ -119,7 +119,7 @@ private class Logger : ILogger public Logger(LogLevel logLevel) => _logLevel = logLevel; - public IDisposable BeginScope(TState state) => NullDisposable.Instance; + public IDisposable BeginScope(TState state) where TState : notnull => NullDisposable.Instance; public bool IsEnabled(LogLevel logLevel) => _logLevel <= logLevel; diff --git a/sandbox/Example.Core.PublishHeaders/Example.Core.PublishHeaders.csproj b/sandbox/Example.Core.PublishHeaders/Example.Core.PublishHeaders.csproj index 8e64548a3..389b10850 100644 --- a/sandbox/Example.Core.PublishHeaders/Example.Core.PublishHeaders.csproj +++ b/sandbox/Example.Core.PublishHeaders/Example.Core.PublishHeaders.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -14,7 +14,7 @@ - + diff --git a/sandbox/Example.Core.PublishModel/Example.Core.PublishModel.csproj b/sandbox/Example.Core.PublishModel/Example.Core.PublishModel.csproj index 0da21d55d..9841a73f9 100644 --- a/sandbox/Example.Core.PublishModel/Example.Core.PublishModel.csproj +++ b/sandbox/Example.Core.PublishModel/Example.Core.PublishModel.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -14,7 +14,7 @@ - + diff --git a/sandbox/Example.Core.SubscribeHeaders/Example.Core.SubscribeHeaders.csproj b/sandbox/Example.Core.SubscribeHeaders/Example.Core.SubscribeHeaders.csproj index 0da21d55d..9841a73f9 100644 --- a/sandbox/Example.Core.SubscribeHeaders/Example.Core.SubscribeHeaders.csproj +++ b/sandbox/Example.Core.SubscribeHeaders/Example.Core.SubscribeHeaders.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -14,7 +14,7 @@ - + diff --git a/sandbox/Example.Core.SubscribeModel/Example.Core.SubscribeModel.csproj b/sandbox/Example.Core.SubscribeModel/Example.Core.SubscribeModel.csproj index 0da21d55d..9841a73f9 100644 --- a/sandbox/Example.Core.SubscribeModel/Example.Core.SubscribeModel.csproj +++ b/sandbox/Example.Core.SubscribeModel/Example.Core.SubscribeModel.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -14,7 +14,7 @@ - + diff --git a/sandbox/Example.Core.SubscribeQueueGroup/Example.Core.SubscribeQueueGroup.csproj b/sandbox/Example.Core.SubscribeQueueGroup/Example.Core.SubscribeQueueGroup.csproj index f0214d692..9081552b2 100644 --- a/sandbox/Example.Core.SubscribeQueueGroup/Example.Core.SubscribeQueueGroup.csproj +++ b/sandbox/Example.Core.SubscribeQueueGroup/Example.Core.SubscribeQueueGroup.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -13,7 +13,7 @@ - + diff --git a/sandbox/Example.Core.SubscribeRaw/Example.Core.SubscribeRaw.csproj b/sandbox/Example.Core.SubscribeRaw/Example.Core.SubscribeRaw.csproj index b709bad71..bae348c31 100644 --- a/sandbox/Example.Core.SubscribeRaw/Example.Core.SubscribeRaw.csproj +++ b/sandbox/Example.Core.SubscribeRaw/Example.Core.SubscribeRaw.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable Example.Core.Subscribe @@ -14,7 +14,7 @@ - + diff --git a/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj b/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj index 5bba973ed..753467df9 100644 --- a/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj +++ b/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -13,7 +13,7 @@ - + diff --git a/sandbox/Example.KeyValueStore.Watcher/Example.KeyValueStore.Watcher.csproj b/sandbox/Example.KeyValueStore.Watcher/Example.KeyValueStore.Watcher.csproj index afe6c77db..35a328dde 100644 --- a/sandbox/Example.KeyValueStore.Watcher/Example.KeyValueStore.Watcher.csproj +++ b/sandbox/Example.KeyValueStore.Watcher/Example.KeyValueStore.Watcher.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false diff --git a/sandbox/Example.ObjectStore/Example.ObjectStore.csproj b/sandbox/Example.ObjectStore/Example.ObjectStore.csproj index 5212087a8..8d4b48c4b 100644 --- a/sandbox/Example.ObjectStore/Example.ObjectStore.csproj +++ b/sandbox/Example.ObjectStore/Example.ObjectStore.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -13,7 +13,7 @@ - + diff --git a/sandbox/Example.OpenTelemetry/Example.OpenTelemetry.csproj b/sandbox/Example.OpenTelemetry/Example.OpenTelemetry.csproj index 90bb3092d..8842b5b96 100644 --- a/sandbox/Example.OpenTelemetry/Example.OpenTelemetry.csproj +++ b/sandbox/Example.OpenTelemetry/Example.OpenTelemetry.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/sandbox/Example.ProtoBufMessages/Example.ProtoBufMessages.csproj b/sandbox/Example.ProtoBufMessages/Example.ProtoBufMessages.csproj index bd3895d28..de0c27dc4 100644 --- a/sandbox/Example.ProtoBufMessages/Example.ProtoBufMessages.csproj +++ b/sandbox/Example.ProtoBufMessages/Example.ProtoBufMessages.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable Example.ProtoMessages @@ -9,15 +9,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/sandbox/Example.Services/Example.Services.csproj b/sandbox/Example.Services/Example.Services.csproj index 628a2a3d5..79ba6eb7e 100644 --- a/sandbox/Example.Services/Example.Services.csproj +++ b/sandbox/Example.Services/Example.Services.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false @@ -13,7 +13,7 @@ - + diff --git a/sandbox/Example.TlsFirst/Example.TlsFirst.csproj b/sandbox/Example.TlsFirst/Example.TlsFirst.csproj index e4a0b5983..69918d1c2 100644 --- a/sandbox/Example.TlsFirst/Example.TlsFirst.csproj +++ b/sandbox/Example.TlsFirst/Example.TlsFirst.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable false diff --git a/sandbox/MicroBenchmark/MicroBenchmark.csproj b/sandbox/MicroBenchmark/MicroBenchmark.csproj index 133cafa6b..c629a1ded 100644 --- a/sandbox/MicroBenchmark/MicroBenchmark.csproj +++ b/sandbox/MicroBenchmark/MicroBenchmark.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/sandbox/MinimumWebApp/MinimumWebApp.csproj b/sandbox/MinimumWebApp/MinimumWebApp.csproj index 3288bafa1..e74be9a4b 100644 --- a/sandbox/MinimumWebApp/MinimumWebApp.csproj +++ b/sandbox/MinimumWebApp/MinimumWebApp.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable false diff --git a/tests/NATS.Client.Core.MemoryTests/NATS.Client.Core.MemoryTests.csproj b/tests/NATS.Client.Core.MemoryTests/NATS.Client.Core.MemoryTests.csproj index 8e5b3d051..ee1d6dac6 100644 --- a/tests/NATS.Client.Core.MemoryTests/NATS.Client.Core.MemoryTests.csproj +++ b/tests/NATS.Client.Core.MemoryTests/NATS.Client.Core.MemoryTests.csproj @@ -14,11 +14,17 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj b/tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj index e165c3680..c4e97bf4a 100644 --- a/tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj +++ b/tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj @@ -11,15 +11,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.Core2.Tests/NATS.Client.Core2.Tests.csproj b/tests/NATS.Client.Core2.Tests/NATS.Client.Core2.Tests.csproj index 75d41bb88..f51cc6ca2 100644 --- a/tests/NATS.Client.Core2.Tests/NATS.Client.Core2.Tests.csproj +++ b/tests/NATS.Client.Core2.Tests/NATS.Client.Core2.Tests.csproj @@ -13,15 +13,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.CoreUnit.Tests/NATS.Client.CoreUnit.Tests.csproj b/tests/NATS.Client.CoreUnit.Tests/NATS.Client.CoreUnit.Tests.csproj index 753b727b4..16fcd6523 100644 --- a/tests/NATS.Client.CoreUnit.Tests/NATS.Client.CoreUnit.Tests.csproj +++ b/tests/NATS.Client.CoreUnit.Tests/NATS.Client.CoreUnit.Tests.csproj @@ -13,15 +13,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj b/tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj index cff8c2b18..06549a70f 100644 --- a/tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj +++ b/tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj @@ -10,13 +10,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj b/tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj index 17292da38..3a52e6456 100644 --- a/tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj +++ b/tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj @@ -10,13 +10,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj b/tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj index 2c6d7bc84..41e93c798 100644 --- a/tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj +++ b/tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj @@ -10,13 +10,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.Platform.Windows.Tests/NATS.Client.Platform.Windows.Tests.csproj b/tests/NATS.Client.Platform.Windows.Tests/NATS.Client.Platform.Windows.Tests.csproj index 4f9119ff4..6b2a4d9ea 100644 --- a/tests/NATS.Client.Platform.Windows.Tests/NATS.Client.Platform.Windows.Tests.csproj +++ b/tests/NATS.Client.Platform.Windows.Tests/NATS.Client.Platform.Windows.Tests.csproj @@ -12,9 +12,12 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj b/tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj index e60a74b5e..cf8973fdb 100644 --- a/tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj +++ b/tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj @@ -10,13 +10,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.Simplified.Tests/NATS.Client.Simplified.Tests.csproj b/tests/NATS.Client.Simplified.Tests/NATS.Client.Simplified.Tests.csproj index 607af6f91..b330af27c 100644 --- a/tests/NATS.Client.Simplified.Tests/NATS.Client.Simplified.Tests.csproj +++ b/tests/NATS.Client.Simplified.Tests/NATS.Client.Simplified.Tests.csproj @@ -11,15 +11,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Client.TestUtilities/NATS.Client.TestUtilities.csproj b/tests/NATS.Client.TestUtilities/NATS.Client.TestUtilities.csproj index a9ab5d786..aadab844c 100644 --- a/tests/NATS.Client.TestUtilities/NATS.Client.TestUtilities.csproj +++ b/tests/NATS.Client.TestUtilities/NATS.Client.TestUtilities.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/tests/NATS.Extensions.Microsoft.DependencyInjection.Tests/NATS.Extensions.Microsoft.DependencyInjection.Tests.csproj b/tests/NATS.Extensions.Microsoft.DependencyInjection.Tests/NATS.Extensions.Microsoft.DependencyInjection.Tests.csproj index 9822666b9..625ae0fec 100644 --- a/tests/NATS.Extensions.Microsoft.DependencyInjection.Tests/NATS.Extensions.Microsoft.DependencyInjection.Tests.csproj +++ b/tests/NATS.Extensions.Microsoft.DependencyInjection.Tests/NATS.Extensions.Microsoft.DependencyInjection.Tests.csproj @@ -9,14 +9,14 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/NATS.Net.DocsExamples/NATS.Net.DocsExamples.csproj b/tests/NATS.Net.DocsExamples/NATS.Net.DocsExamples.csproj index fd0c25fff..5af7881e5 100644 --- a/tests/NATS.Net.DocsExamples/NATS.Net.DocsExamples.csproj +++ b/tests/NATS.Net.DocsExamples/NATS.Net.DocsExamples.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj b/tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj index 99a58117f..43557c558 100644 --- a/tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj +++ b/tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj @@ -10,15 +10,15 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tools/Schema.Generation/Schema.Generation.csproj b/tools/Schema.Generation/Schema.Generation.csproj index e26ff8244..25c134c24 100644 --- a/tools/Schema.Generation/Schema.Generation.csproj +++ b/tools/Schema.Generation/Schema.Generation.csproj @@ -2,14 +2,14 @@ Exe - net6.0 + net8.0 enable enable false - +