From 1480f5ac48c5a119954b086b5e3c0bebec6cf8f7 Mon Sep 17 00:00:00 2001 From: Magne Helleborg Date: Mon, 9 Sep 2024 14:52:27 +0200 Subject: [PATCH 1/2] Upgraded dependencies --- .../AutoClusterBenchmark.csproj | 6 +++--- .../ClusterBenchmark/ClusterBenchmark.csproj | 6 +++--- .../ClusterMicroBenchmarks.csproj | 2 +- .../GossipBenchmark/Messages/Messages.csproj | 6 +++--- benchmarks/HostedService/HostedService.csproj | 2 +- .../MailboxBenchmark/MailboxBenchmark.csproj | 2 +- .../ProtoActorBenchmarks.csproj | 2 +- .../RemoteBenchmark/Messages/Messages.csproj | 4 ++-- .../SkyriseMini/Client/SkyriseMiniClient.csproj | 8 ++++---- .../SkyriseMini/Server/SkyriseMiniServer.csproj | 8 ++++---- examples/ActorMetrics/ActorMetrics.csproj | 8 ++++---- examples/AspNetGrains/Messages/Messages.csproj | 6 +++--- examples/Chat/Messages/Chat.Messages.csproj | 2 +- .../Messages/Messages.csproj | 6 +++--- examples/ClusterK8sGrains/Messages/Messages.csproj | 8 ++++---- examples/ClusterPubSub/ClusterPubSub.csproj | 6 +++--- .../ClusterPubSubBatchingProducer.csproj | 4 ++-- .../DependencyInjection/DependencyInjection.csproj | 2 +- .../EventStreamTopicsCluster.csproj | 2 +- .../KafkaVirtualActorIngress.csproj | 4 ++-- examples/Persistence/Messages/Messages.csproj | 4 ++-- src/Directory.Build.props | 6 +++--- src/Proto.Actor/Proto.Actor.csproj | 6 +++--- src/Proto.Analyzers/Proto.Analyzers.csproj | 2 +- .../Proto.Cluster.AzureContainerApps.csproj | 8 ++++---- .../Proto.Cluster.CodeGen.csproj | 4 ++-- .../Pages/ActorDiagram.razor | 4 ++-- .../Proto.Cluster.Identity.MongoDb.csproj | 2 +- .../Proto.Cluster.Kubernetes.csproj | 4 ++-- .../Proto.Cluster.SeedNode.MongoDb.csproj | 2 +- src/Proto.Cluster/Proto.Cluster.csproj | 2 +- src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj | 4 ++-- .../Proto.Persistence.MongoDB.csproj | 2 +- src/Proto.Remote/Proto.Remote.csproj | 12 ++++++------ tests/Directory.Build.props | 12 ++++++------ .../Proto.Analyzers.Tests.csproj | 8 ++++---- .../Proto.Cluster.CodeGen.Tests.csproj | 2 +- .../Proto.Cluster.Identity.Tests.csproj | 2 +- .../Proto.Cluster.MongoIdentity.Tests.csproj | 2 +- .../Proto.Cluster.PartitionIdentity.Tests.csproj | 2 +- .../Proto.Cluster.Tests/Proto.Cluster.Tests.csproj | 4 ++-- .../Proto.OpenTelemetry.Tests.csproj | 6 +++--- .../Proto.Persistence.Tests.csproj | 14 +++++++------- .../Proto.Remote.Tests.Messages.csproj | 2 +- tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj | 2 +- 45 files changed, 106 insertions(+), 106 deletions(-) diff --git a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj index 11e0b1545d..afe2bae444 100644 --- a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj +++ b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj @@ -24,10 +24,10 @@ - - + + - + diff --git a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj index ea09a913dc..54faae0c3e 100644 --- a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj +++ b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj @@ -19,10 +19,10 @@ - - + + - + diff --git a/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj b/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj index d16026d7b7..1fdc75a08c 100644 --- a/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj +++ b/benchmarks/ClusterMicroBenchmarks/ClusterMicroBenchmarks.csproj @@ -7,7 +7,7 @@ - + diff --git a/benchmarks/GossipBenchmark/Messages/Messages.csproj b/benchmarks/GossipBenchmark/Messages/Messages.csproj index 7a59490198..33135b4c84 100644 --- a/benchmarks/GossipBenchmark/Messages/Messages.csproj +++ b/benchmarks/GossipBenchmark/Messages/Messages.csproj @@ -5,9 +5,9 @@ net6.0;net7.0;net8.0 - - - + + + diff --git a/benchmarks/HostedService/HostedService.csproj b/benchmarks/HostedService/HostedService.csproj index 6241a100cc..848864fad3 100644 --- a/benchmarks/HostedService/HostedService.csproj +++ b/benchmarks/HostedService/HostedService.csproj @@ -7,7 +7,7 @@ - + diff --git a/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj b/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj index bc03e6c5c9..cf6fbae85e 100644 --- a/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj +++ b/benchmarks/MailboxBenchmark/MailboxBenchmark.csproj @@ -7,6 +7,6 @@ - + diff --git a/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj b/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj index a2bd2ae444..43cc43968a 100644 --- a/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj +++ b/benchmarks/ProtoActorBenchmarks/ProtoActorBenchmarks.csproj @@ -7,7 +7,7 @@ true - + diff --git a/benchmarks/RemoteBenchmark/Messages/Messages.csproj b/benchmarks/RemoteBenchmark/Messages/Messages.csproj index 3957e8928d..67007370f5 100644 --- a/benchmarks/RemoteBenchmark/Messages/Messages.csproj +++ b/benchmarks/RemoteBenchmark/Messages/Messages.csproj @@ -4,9 +4,9 @@ net6.0;net7.0;net8.0 - + - + diff --git a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj index 3094eae7fc..86c4466b43 100644 --- a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj +++ b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj @@ -18,18 +18,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + diff --git a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj index cfcdde1a31..8c2be7be2d 100644 --- a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj +++ b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj @@ -18,18 +18,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + diff --git a/examples/ActorMetrics/ActorMetrics.csproj b/examples/ActorMetrics/ActorMetrics.csproj index 9131d538bf..7ffceea752 100644 --- a/examples/ActorMetrics/ActorMetrics.csproj +++ b/examples/ActorMetrics/ActorMetrics.csproj @@ -6,14 +6,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/examples/AspNetGrains/Messages/Messages.csproj b/examples/AspNetGrains/Messages/Messages.csproj index fca1b3b6c4..30e9a93a54 100644 --- a/examples/AspNetGrains/Messages/Messages.csproj +++ b/examples/AspNetGrains/Messages/Messages.csproj @@ -4,9 +4,9 @@ net6.0 - - - + + + diff --git a/examples/Chat/Messages/Chat.Messages.csproj b/examples/Chat/Messages/Chat.Messages.csproj index 7981caf094..9960fd05a6 100644 --- a/examples/Chat/Messages/Chat.Messages.csproj +++ b/examples/Chat/Messages/Chat.Messages.csproj @@ -3,7 +3,7 @@ net6.0 - + diff --git a/examples/ClusterGrainHelloWorld/Messages/Messages.csproj b/examples/ClusterGrainHelloWorld/Messages/Messages.csproj index fca1b3b6c4..30e9a93a54 100644 --- a/examples/ClusterGrainHelloWorld/Messages/Messages.csproj +++ b/examples/ClusterGrainHelloWorld/Messages/Messages.csproj @@ -4,9 +4,9 @@ net6.0 - - - + + + diff --git a/examples/ClusterK8sGrains/Messages/Messages.csproj b/examples/ClusterK8sGrains/Messages/Messages.csproj index 9d58765594..862079bf92 100644 --- a/examples/ClusterK8sGrains/Messages/Messages.csproj +++ b/examples/ClusterK8sGrains/Messages/Messages.csproj @@ -5,9 +5,9 @@ 11 - - - + + + @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/examples/ClusterPubSub/ClusterPubSub.csproj b/examples/ClusterPubSub/ClusterPubSub.csproj index 43d327ec64..67b4d6db8f 100644 --- a/examples/ClusterPubSub/ClusterPubSub.csproj +++ b/examples/ClusterPubSub/ClusterPubSub.csproj @@ -10,13 +10,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj b/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj index f0b0ea2cfd..5c4c05ad04 100644 --- a/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj +++ b/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/examples/DependencyInjection/DependencyInjection.csproj b/examples/DependencyInjection/DependencyInjection.csproj index dadca945aa..4e8bd13597 100644 --- a/examples/DependencyInjection/DependencyInjection.csproj +++ b/examples/DependencyInjection/DependencyInjection.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj b/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj index ab04c25c51..f2d6f3da49 100644 --- a/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj +++ b/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/examples/KafkaVirtualActorIngress/KafkaVirtualActorIngress.csproj b/examples/KafkaVirtualActorIngress/KafkaVirtualActorIngress.csproj index 2b20fc8e54..3e82ce94d0 100644 --- a/examples/KafkaVirtualActorIngress/KafkaVirtualActorIngress.csproj +++ b/examples/KafkaVirtualActorIngress/KafkaVirtualActorIngress.csproj @@ -15,8 +15,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/examples/Persistence/Messages/Messages.csproj b/examples/Persistence/Messages/Messages.csproj index 8454c5089c..5c4d0c1547 100644 --- a/examples/Persistence/Messages/Messages.csproj +++ b/examples/Persistence/Messages/Messages.csproj @@ -3,9 +3,9 @@ net6.0 - + - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 755e7e522f..2e8f80da61 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,10 +17,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Proto.Actor/Proto.Actor.csproj b/src/Proto.Actor/Proto.Actor.csproj index 56bda8a96c..0869ec4ba1 100644 --- a/src/Proto.Actor/Proto.Actor.csproj +++ b/src/Proto.Actor/Proto.Actor.csproj @@ -9,14 +9,14 @@ - - + + - + diff --git a/src/Proto.Analyzers/Proto.Analyzers.csproj b/src/Proto.Analyzers/Proto.Analyzers.csproj index eafe2c3852..b63f14e85e 100644 --- a/src/Proto.Analyzers/Proto.Analyzers.csproj +++ b/src/Proto.Analyzers/Proto.Analyzers.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj b/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj index aa6f65d03c..3a8b0bc260 100644 --- a/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj +++ b/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj @@ -4,10 +4,10 @@ net6.0;net7.0;net8.0 - - - - + + + + diff --git a/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj b/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj index 4af4f3325e..bc0ff3962f 100644 --- a/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj +++ b/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Proto.Cluster.Dashboard/Pages/ActorDiagram.razor b/src/Proto.Cluster.Dashboard/Pages/ActorDiagram.razor index 2c0e9b9940..478df48f20 100644 --- a/src/Proto.Cluster.Dashboard/Pages/ActorDiagram.razor +++ b/src/Proto.Cluster.Dashboard/Pages/ActorDiagram.razor @@ -16,11 +16,11 @@ ServerData="LoadServerData" Items="_root.Children" MultiSelection="false" - CanHover="true" + Hover="true" SelectedValueChanged="(TreeNode node) => SelectedValueChanged(node)"> - + diff --git a/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj b/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj index d9503bce05..17183015f7 100644 --- a/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj +++ b/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj b/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj index 9dc755994d..efed5a6c4b 100644 --- a/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj +++ b/src/Proto.Cluster.SeedNode.MongoDb/Proto.Cluster.SeedNode.MongoDb.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Proto.Cluster/Proto.Cluster.csproj b/src/Proto.Cluster/Proto.Cluster.csproj index 0b8b6785e6..68278e4a4e 100644 --- a/src/Proto.Cluster/Proto.Cluster.csproj +++ b/src/Proto.Cluster/Proto.Cluster.csproj @@ -7,7 +7,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj index c29c1aa30a..be29c1e95d 100644 --- a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj +++ b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj @@ -5,8 +5,8 @@ 10 - - + + diff --git a/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj b/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj index 7e0b5c7c8b..3b051e539f 100644 --- a/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj +++ b/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj @@ -3,7 +3,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.Remote/Proto.Remote.csproj b/src/Proto.Remote/Proto.Remote.csproj index 7dac8e4ffe..1e87f3fff3 100644 --- a/src/Proto.Remote/Proto.Remote.csproj +++ b/src/Proto.Remote/Proto.Remote.csproj @@ -8,12 +8,12 @@ - - - - - - + + + + + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 22eb5da78a..78cba3b299 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -9,15 +9,15 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Proto.Analyzers.Tests/Proto.Analyzers.Tests.csproj b/tests/Proto.Analyzers.Tests/Proto.Analyzers.Tests.csproj index f1b09fb634..85ba272c4d 100644 --- a/tests/Proto.Analyzers.Tests/Proto.Analyzers.Tests.csproj +++ b/tests/Proto.Analyzers.Tests/Proto.Analyzers.Tests.csproj @@ -8,10 +8,10 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj b/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj index c56bc80a11..4a50f26630 100644 --- a/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj +++ b/tests/Proto.Cluster.CodeGen.Tests/Proto.Cluster.CodeGen.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj b/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj index 12a9984e0c..f738f62ba5 100644 --- a/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj +++ b/tests/Proto.Cluster.Identity.Tests/Proto.Cluster.Identity.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj b/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj index 8fbb82e1af..1b079480e3 100644 --- a/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj +++ b/tests/Proto.Cluster.MongoIdentity.Tests/Proto.Cluster.MongoIdentity.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj b/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj index 006707f044..b31e3b7d33 100644 --- a/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj +++ b/tests/Proto.Cluster.PartitionIdentity.Tests/Proto.Cluster.PartitionIdentity.Tests.csproj @@ -10,7 +10,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj b/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj index 883ffbe21d..2e2e549321 100644 --- a/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj +++ b/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj @@ -13,10 +13,10 @@ - + - + diff --git a/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj b/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj index 549793b335..eda9b68f8b 100644 --- a/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj +++ b/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj @@ -9,13 +9,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj b/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj index 75d190406e..abedec98d2 100644 --- a/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj +++ b/tests/Proto.Persistence.Tests/Proto.Persistence.Tests.csproj @@ -5,13 +5,13 @@ - - - - - - - + + + + + + + diff --git a/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj b/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj index ff24dc0b20..5d0309c170 100644 --- a/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj +++ b/tests/Proto.Remote.Tests.Messages/Proto.Remote.Tests.Messages.csproj @@ -6,7 +6,7 @@ net6.0;net7.0;net8.0 - + diff --git a/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj b/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj index cd79d45868..92c1be8fe5 100644 --- a/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj +++ b/tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj @@ -4,7 +4,7 @@ net6.0;net7.0;net8.0 - + From 8f5d7de0a5d8ce7bd5ec1358609a172e4f5a5c22 Mon Sep 17 00:00:00 2001 From: Magne Helleborg Date: Mon, 9 Sep 2024 15:23:42 +0200 Subject: [PATCH 2/2] Dependency upgrades & cleanup --- .../AutoClusterBenchmark.csproj | 8 ++++---- .../ClusterBenchmark/ClusterBenchmark.csproj | 8 ++++---- benchmarks/HostedService/HostedService.csproj | 6 +++--- .../KubernetesDiagnostics.csproj | 4 ++-- benchmarks/RemoteBenchmark/Node1/Node1.csproj | 2 +- benchmarks/RemoteBenchmark/Node2/Node2.csproj | 2 +- .../Client/SkyriseMiniClient.csproj | 8 ++++---- .../Server/SkyriseMiniServer.csproj | 8 ++++---- examples/ClusterPubSub/ClusterPubSub.csproj | 2 +- .../ClusterPubSubBatchingProducer.csproj | 2 +- .../DeadLetterThrottling.csproj | 2 +- .../EventStreamTopicsCluster.csproj | 4 ++-- examples/Supervision/Supervision.csproj | 4 ++-- src/Directory.Build.props | 2 +- src/Proto.Actor/Proto.Actor.csproj | 10 +++++----- src/Proto.Analyzers/Proto.Analyzers.csproj | 1 + .../Proto.Cluster.AmazonECS.csproj | 4 ++-- .../Proto.Cluster.CodeGen.csproj | 4 ++-- .../Proto.Cluster.Consul.csproj | 4 ++-- .../Proto.Cluster.Dashboard.csproj | 2 +- .../Shared/NavMenu.razor | 8 ++++---- .../Proto.Cluster.TestProvider.csproj | 2 +- .../Proto.Persistence.DynamoDB.csproj | 2 +- .../Proto.Persistence.Marten.csproj | 2 +- .../Proto.Persistence.RavenDB.csproj | 2 +- .../Proto.Persistence.SqlServer.csproj | 4 ++-- .../Proto.Persistence.Sqlite.csproj | 2 +- .../Proto.Actor.Tests/Futures/FutureTests.cs | 20 +++++++++---------- tests/Proto.Analyzers.Tests/AnalyzerTest.cs | 2 +- .../CodeFixProviderTests.cs | 2 +- .../Proto.TestFixtures.csproj | 8 ++++---- 31 files changed, 70 insertions(+), 71 deletions(-) diff --git a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj index afe2bae444..cac6f3022a 100644 --- a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj +++ b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj @@ -26,13 +26,13 @@ - + - - - + + + diff --git a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj index 54faae0c3e..e688ac68f4 100644 --- a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj +++ b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj @@ -21,13 +21,13 @@ - + - - - + + + diff --git a/benchmarks/HostedService/HostedService.csproj b/benchmarks/HostedService/HostedService.csproj index 848864fad3..9d537b1d14 100644 --- a/benchmarks/HostedService/HostedService.csproj +++ b/benchmarks/HostedService/HostedService.csproj @@ -1,12 +1,12 @@ - net6.0 + net8.0 - - + + diff --git a/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj b/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj index edd96357f3..9166cea696 100644 --- a/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj +++ b/benchmarks/KubernetesDiagnostics/KubernetesDiagnostics.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/benchmarks/RemoteBenchmark/Node1/Node1.csproj b/benchmarks/RemoteBenchmark/Node1/Node1.csproj index 597438389a..a1e93023e7 100644 --- a/benchmarks/RemoteBenchmark/Node1/Node1.csproj +++ b/benchmarks/RemoteBenchmark/Node1/Node1.csproj @@ -13,7 +13,7 @@ - + NETCORE diff --git a/benchmarks/RemoteBenchmark/Node2/Node2.csproj b/benchmarks/RemoteBenchmark/Node2/Node2.csproj index 2cf2734a1b..5550f3a5b2 100644 --- a/benchmarks/RemoteBenchmark/Node2/Node2.csproj +++ b/benchmarks/RemoteBenchmark/Node2/Node2.csproj @@ -12,7 +12,7 @@ - + NETCORE diff --git a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj index 86c4466b43..ad2b98d2e4 100644 --- a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj +++ b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj @@ -25,10 +25,10 @@ - - - - + + + + diff --git a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj index 8c2be7be2d..7873fcbbc1 100644 --- a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj +++ b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj @@ -25,10 +25,10 @@ - - - - + + + + diff --git a/examples/ClusterPubSub/ClusterPubSub.csproj b/examples/ClusterPubSub/ClusterPubSub.csproj index 67b4d6db8f..b23e5dc97c 100644 --- a/examples/ClusterPubSub/ClusterPubSub.csproj +++ b/examples/ClusterPubSub/ClusterPubSub.csproj @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj b/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj index 5c4c05ad04..519211f2fc 100644 --- a/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj +++ b/examples/ClusterPubSubBatchingProducer/ClusterPubSubBatchingProducer.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/examples/DeadLetterThrottling/DeadLetterThrottling.csproj b/examples/DeadLetterThrottling/DeadLetterThrottling.csproj index 22951201ee..7b31f67932 100644 --- a/examples/DeadLetterThrottling/DeadLetterThrottling.csproj +++ b/examples/DeadLetterThrottling/DeadLetterThrottling.csproj @@ -10,7 +10,7 @@ - + diff --git a/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj b/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj index f2d6f3da49..f4e0da3405 100644 --- a/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj +++ b/examples/EventStreamTopicsCluster/EventStreamTopicsCluster.csproj @@ -17,8 +17,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/examples/Supervision/Supervision.csproj b/examples/Supervision/Supervision.csproj index 810d1550c3..a9963cd1e1 100644 --- a/examples/Supervision/Supervision.csproj +++ b/examples/Supervision/Supervision.csproj @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2e8f80da61..b074b0ff11 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Proto.Actor/Proto.Actor.csproj b/src/Proto.Actor/Proto.Actor.csproj index 0869ec4ba1..993eb63df3 100644 --- a/src/Proto.Actor/Proto.Actor.csproj +++ b/src/Proto.Actor/Proto.Actor.csproj @@ -12,12 +12,12 @@ - - - - + + + + - + diff --git a/src/Proto.Analyzers/Proto.Analyzers.csproj b/src/Proto.Analyzers/Proto.Analyzers.csproj index b63f14e85e..5c2f1a4251 100644 --- a/src/Proto.Analyzers/Proto.Analyzers.csproj +++ b/src/Proto.Analyzers/Proto.Analyzers.csproj @@ -8,6 +8,7 @@ 10 true false + true diff --git a/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj b/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj index 39a3984124..d66cdb4300 100644 --- a/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj +++ b/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj b/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj index bc0ff3962f..4e60a1d644 100644 --- a/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj +++ b/src/Proto.Cluster.CodeGen/Proto.Cluster.CodeGen.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj b/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj index 482452e16b..f2a67830e5 100644 --- a/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj +++ b/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj @@ -4,8 +4,8 @@ net6.0;net7.0;net8.0 - - + + diff --git a/src/Proto.Cluster.Dashboard/Proto.Cluster.Dashboard.csproj b/src/Proto.Cluster.Dashboard/Proto.Cluster.Dashboard.csproj index 3e9fa414be..a77cc75e79 100644 --- a/src/Proto.Cluster.Dashboard/Proto.Cluster.Dashboard.csproj +++ b/src/Proto.Cluster.Dashboard/Proto.Cluster.Dashboard.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Proto.Cluster.Dashboard/Shared/NavMenu.razor b/src/Proto.Cluster.Dashboard/Shared/NavMenu.razor index ec3a69a70b..833143b121 100644 --- a/src/Proto.Cluster.Dashboard/Shared/NavMenu.razor +++ b/src/Proto.Cluster.Dashboard/Shared/NavMenu.razor @@ -4,9 +4,9 @@ - Cluster Overview - Cluster State - Actors - Diagnostics + Cluster Overview + Cluster State + Actors + Diagnostics \ No newline at end of file diff --git a/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj b/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj index b61d1434ec..879833e06a 100644 --- a/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj +++ b/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj @@ -5,7 +5,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj b/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj index e37ee381f6..346afc954f 100644 --- a/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj +++ b/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj @@ -3,7 +3,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj b/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj index 3d2d04af28..ca212fb0e3 100644 --- a/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj +++ b/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj @@ -3,7 +3,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj b/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj index 53b5a50fe7..dabdefe931 100644 --- a/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj +++ b/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj @@ -3,7 +3,7 @@ net6.0;net7.0;net8.0 - + diff --git a/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj b/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj index 52bd0e11f0..2493738d98 100644 --- a/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj +++ b/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj @@ -3,8 +3,8 @@ net6.0;net7.0;net8.0 - - + + diff --git a/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj b/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj index c6cce6f4f2..0471e9a95a 100644 --- a/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj +++ b/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj @@ -3,7 +3,7 @@ net6.0;net7.0;net8.0 - + diff --git a/tests/Proto.Actor.Tests/Futures/FutureTests.cs b/tests/Proto.Actor.Tests/Futures/FutureTests.cs index 841cac7a30..ec5b25caff 100644 --- a/tests/Proto.Actor.Tests/Futures/FutureTests.cs +++ b/tests/Proto.Actor.Tests/Futures/FutureTests.cs @@ -32,7 +32,7 @@ public async Task Given_Actor_When_AwaitRequestAsync_Should_ReturnReply() ) ); - var reply = context.RequestAsync(pid, "hello").Result; + var reply = await context.RequestAsync(pid, "hello"); Assert.Equal("hey", reply); } @@ -66,7 +66,7 @@ public async Task Given_Actor_When_AwaitContextRequestAsync_Should_GetReply() ) ); - var reply2 = context.RequestAsync(pid2, "hello").Result; + var reply2 = await context.RequestAsync(pid2, "hello"); Assert.Equal("hellohey", reply2); } @@ -89,13 +89,13 @@ public async Task Given_Actor_When_ReplyIsNull_Should_Return() ) ); - var reply = context.RequestAsync(pid, "hello", TimeSpan.FromSeconds(1)).Result; + var reply = await context.RequestAsync(pid, "hello", TimeSpan.FromSeconds(1)); Assert.Null(reply); } [Fact] - public void TestInATask() => + public Task TestInATask() => SafeTask.Run(async () => { await using var system = new ActorSystem(); @@ -119,15 +119,14 @@ public void TestInATask() => var reply1 = await context.RequestAsync(pid, "hello1", TimeSpan.FromSeconds(10)); Assert.Null(reply1); _output.WriteLine("got response 1"); - var reply2 = context.RequestAsync(pid, "hello2", TimeSpan.FromSeconds(10)).Result; + var reply2 = await context.RequestAsync(pid, "hello2", TimeSpan.FromSeconds(10)); Assert.Null(reply2); _output.WriteLine("got response 2"); } - ) - .Wait(); + ); [Fact] - public void TestInATaskIndirect() => + public Task TestInATaskIndirect() => Task.Run(async () => { await using var system = new ActorSystem(); @@ -165,10 +164,9 @@ public void TestInATaskIndirect() => var reply1 = await context.RequestAsync(pid, "hello1", TimeSpan.FromSeconds(2)); Assert.Null(reply1); _output.WriteLine("got response 1"); - var reply2 = context.RequestAsync(pid, "hello2", TimeSpan.FromSeconds(2)).Result; + var reply2 = await context.RequestAsync(pid, "hello2", TimeSpan.FromSeconds(2)); Assert.Null(reply2); _output.WriteLine("got response 2"); } - ) - .Wait(); + ); } \ No newline at end of file diff --git a/tests/Proto.Analyzers.Tests/AnalyzerTest.cs b/tests/Proto.Analyzers.Tests/AnalyzerTest.cs index ef7823bfec..14e657cd00 100644 --- a/tests/Proto.Analyzers.Tests/AnalyzerTest.cs +++ b/tests/Proto.Analyzers.Tests/AnalyzerTest.cs @@ -17,7 +17,7 @@ namespace Proto.Analyzers.Tests; protected Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) { - var test = new CSharpAnalyzerTest + var test = new CSharpAnalyzerTest { TestState = { diff --git a/tests/Proto.Analyzers.Tests/CodeFixProviderTests.cs b/tests/Proto.Analyzers.Tests/CodeFixProviderTests.cs index fb21c1ead0..94fb12891f 100644 --- a/tests/Proto.Analyzers.Tests/CodeFixProviderTests.cs +++ b/tests/Proto.Analyzers.Tests/CodeFixProviderTests.cs @@ -12,7 +12,7 @@ public abstract class CodeFixProviderTests : AnalyzerTest + var test = new CSharpCodeFixTest { TestCode = source, TestState = diff --git a/tests/Proto.TestFixtures/Proto.TestFixtures.csproj b/tests/Proto.TestFixtures/Proto.TestFixtures.csproj index ac24d5f82d..bea9af9e20 100644 --- a/tests/Proto.TestFixtures/Proto.TestFixtures.csproj +++ b/tests/Proto.TestFixtures/Proto.TestFixtures.csproj @@ -10,10 +10,10 @@ - - - - + + + +