From 6d9968027aa174dbacdde51798d6e0154988136f Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Wed, 6 May 2026 14:28:18 +0200 Subject: [PATCH 1/3] Update Integration/Messaging/Stream projects to .NET 8 --- Messaging/src/Console/Common/Console.Common.csproj | 2 +- .../DependencyInjection/DependencyInjection.csproj | 2 +- .../EndpointManualContainer.csproj | 2 +- .../EndpointRegistration.csproj | 2 +- .../Console/ManualContainer/ManualContainer.csproj | 2 +- .../Console/RabbitListener/RabbitListener.csproj | 2 +- .../RabbitListenerHeaders.csproj | 2 +- .../TemplateSendReceive/TemplateSendReceive.csproj | 2 +- Messaging/src/RabbitMQWeb/RabbitMQWeb.csproj | 2 +- .../src/RabbitMQWeb2/Common/Web.Common.csproj | 2 +- .../MonitorRabbitMQ/MonitorRabbitMQ.csproj | 2 +- .../WriteToRabbitMQ/WriteToRabbitMQ.csproj | 2 +- .../Tutorials/Tutorial1/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial1/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial2/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial2/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial3/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial3/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial4/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial4/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial5/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial5/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial6/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial6/Sender/Sender.csproj | 2 +- .../Tutorials/Tutorial7/Receiver/Receiver.csproj | 2 +- .../src/Tutorials/Tutorial7/Sender/Sender.csproj | 2 +- Stream/Basic/Basic.csproj | 2 +- Stream/Basic/Directory.Build.props | 4 ++-- .../CloudDataflowLogSink.csproj | 2 +- Stream/CloudDataFlowLogSink/Directory.Build.props | 4 ++-- .../CloudDataflowLogSinkK8s.csproj | 2 +- .../CloudDataFlowLogSinkK8s/Directory.Build.props | 4 ++-- .../CloudDataflowToUpperProcessor.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../CloudDataflowToUpperProcessorK8s.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../Directory.Build.props | 4 ++-- .../DynamicDestinationMessaging.csproj | 2 +- Stream/EFCore/Directory.Build.props | 4 ++-- Stream/EFCore/EFCore.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../LoggingConsumerApplication.csproj | 2 +- Stream/PartitionedConsumer/Directory.Build.props | 4 ++-- .../PartitionedConsumer/PartitionedConsumer.csproj | 2 +- Stream/PartitionedProducer/Directory.Build.props | 4 ++-- .../PartitionedProducer/PartitionedProducer.csproj | 2 +- Stream/PolledConsumers/Directory.Build.props | 4 ++-- Stream/PolledConsumers/PolledConsumers.csproj | 2 +- Stream/ReRouteDlq/Directory.Build.props | 4 ++-- Stream/ReRouteDlq/ReRouteDlq.csproj | 2 +- Stream/ReRouteDlqDelayed/Directory.Build.props | 4 ++-- Stream/ReRouteDlqDelayed/ReRouteDlqDelayed.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../ReRouteDlqRepublishToDlqFalse.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../ReRouteDlqRepublishToDlqTrue.csproj | 2 +- .../Directory.Build.props | 4 ++-- .../TestPocoWithAnnotatedArguments.csproj | 2 +- Stream/TransformProcessor/Directory.Build.props | 4 ++-- .../TransformProcessor/TransformProcessor.csproj | 2 +- Stream/UsageCost/UsageLogger/Directory.Build.props | 4 ++-- Stream/UsageCost/UsageLogger/UsageLogger.csproj | 2 +- .../UsageCost/UsageProcessor/Directory.Build.props | 4 ++-- .../UsageCost/UsageProcessor/UsageProcessor.csproj | 2 +- Stream/UsageCost/UsageSender/Directory.Build.props | 4 ++-- Stream/UsageCost/UsageSender/UsageSender.csproj | 2 +- Stream/VoteHandler/Directory.Build.props | 4 ++-- Stream/VoteHandler/VoteHandler.csproj | 2 +- Stream/XDeathApplication/Directory.Build.props | 4 ++-- Stream/XDeathApplication/XDeathApplication.csproj | 2 +- config/Directory.Build.net60.props | 14 -------------- configure.ps1 | 14 -------------- 72 files changed, 92 insertions(+), 120 deletions(-) delete mode 100644 config/Directory.Build.net60.props diff --git a/Messaging/src/Console/Common/Console.Common.csproj b/Messaging/src/Console/Common/Console.Common.csproj index a94547be7..5a495835d 100644 --- a/Messaging/src/Console/Common/Console.Common.csproj +++ b/Messaging/src/Console/Common/Console.Common.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable diff --git a/Messaging/src/Console/DependencyInjection/DependencyInjection.csproj b/Messaging/src/Console/DependencyInjection/DependencyInjection.csproj index 84f4699e1..fba47bee2 100644 --- a/Messaging/src/Console/DependencyInjection/DependencyInjection.csproj +++ b/Messaging/src/Console/DependencyInjection/DependencyInjection.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/EndpointManualContainer/EndpointManualContainer.csproj b/Messaging/src/Console/EndpointManualContainer/EndpointManualContainer.csproj index d8e6dd83a..7e69b7687 100644 --- a/Messaging/src/Console/EndpointManualContainer/EndpointManualContainer.csproj +++ b/Messaging/src/Console/EndpointManualContainer/EndpointManualContainer.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/EndpointRegistration/EndpointRegistration.csproj b/Messaging/src/Console/EndpointRegistration/EndpointRegistration.csproj index d8e6dd83a..7e69b7687 100644 --- a/Messaging/src/Console/EndpointRegistration/EndpointRegistration.csproj +++ b/Messaging/src/Console/EndpointRegistration/EndpointRegistration.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/ManualContainer/ManualContainer.csproj b/Messaging/src/Console/ManualContainer/ManualContainer.csproj index d8e6dd83a..7e69b7687 100644 --- a/Messaging/src/Console/ManualContainer/ManualContainer.csproj +++ b/Messaging/src/Console/ManualContainer/ManualContainer.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/RabbitListener/RabbitListener.csproj b/Messaging/src/Console/RabbitListener/RabbitListener.csproj index d8e6dd83a..7e69b7687 100644 --- a/Messaging/src/Console/RabbitListener/RabbitListener.csproj +++ b/Messaging/src/Console/RabbitListener/RabbitListener.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/RabbitListenerHeaders/RabbitListenerHeaders.csproj b/Messaging/src/Console/RabbitListenerHeaders/RabbitListenerHeaders.csproj index 84f4699e1..fba47bee2 100644 --- a/Messaging/src/Console/RabbitListenerHeaders/RabbitListenerHeaders.csproj +++ b/Messaging/src/Console/RabbitListenerHeaders/RabbitListenerHeaders.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/Console/TemplateSendReceive/TemplateSendReceive.csproj b/Messaging/src/Console/TemplateSendReceive/TemplateSendReceive.csproj index 341cf2bd0..aa413495f 100644 --- a/Messaging/src/Console/TemplateSendReceive/TemplateSendReceive.csproj +++ b/Messaging/src/Console/TemplateSendReceive/TemplateSendReceive.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/Messaging/src/RabbitMQWeb/RabbitMQWeb.csproj b/Messaging/src/RabbitMQWeb/RabbitMQWeb.csproj index 64dd0dde6..b354c7ecd 100644 --- a/Messaging/src/RabbitMQWeb/RabbitMQWeb.csproj +++ b/Messaging/src/RabbitMQWeb/RabbitMQWeb.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true diff --git a/Messaging/src/RabbitMQWeb2/Common/Web.Common.csproj b/Messaging/src/RabbitMQWeb2/Common/Web.Common.csproj index dbc151713..58990cd56 100644 --- a/Messaging/src/RabbitMQWeb2/Common/Web.Common.csproj +++ b/Messaging/src/RabbitMQWeb2/Common/Web.Common.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/Messaging/src/RabbitMQWeb2/MonitorRabbitMQ/MonitorRabbitMQ.csproj b/Messaging/src/RabbitMQWeb2/MonitorRabbitMQ/MonitorRabbitMQ.csproj index c6ee01f6d..6c57dbaef 100644 --- a/Messaging/src/RabbitMQWeb2/MonitorRabbitMQ/MonitorRabbitMQ.csproj +++ b/Messaging/src/RabbitMQWeb2/MonitorRabbitMQ/MonitorRabbitMQ.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true diff --git a/Messaging/src/RabbitMQWeb2/WriteToRabbitMQ/WriteToRabbitMQ.csproj b/Messaging/src/RabbitMQWeb2/WriteToRabbitMQ/WriteToRabbitMQ.csproj index 44f28a40c..5a444988d 100644 --- a/Messaging/src/RabbitMQWeb2/WriteToRabbitMQ/WriteToRabbitMQ.csproj +++ b/Messaging/src/RabbitMQWeb2/WriteToRabbitMQ/WriteToRabbitMQ.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true diff --git a/Messaging/src/Tutorials/Tutorial1/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial1/Receiver/Receiver.csproj index 9822afa23..476fcdbe1 100644 --- a/Messaging/src/Tutorials/Tutorial1/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial1/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial1/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial1/Sender/Sender.csproj index 6f7b05b7b..ee5afa8e4 100644 --- a/Messaging/src/Tutorials/Tutorial1/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial1/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-2F9F8745-3AD7-41AD-AF06-AAB67AD8DD50 diff --git a/Messaging/src/Tutorials/Tutorial2/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial2/Receiver/Receiver.csproj index 145f8a8e3..b87e0179f 100644 --- a/Messaging/src/Tutorials/Tutorial2/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial2/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial2/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial2/Sender/Sender.csproj index a7c3e708c..2f2d2da35 100644 --- a/Messaging/src/Tutorials/Tutorial2/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial2/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-29CDA118-FCEF-4E21-876D-33FB66A1B06E diff --git a/Messaging/src/Tutorials/Tutorial3/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial3/Receiver/Receiver.csproj index 9278de72d..82c29df0b 100644 --- a/Messaging/src/Tutorials/Tutorial3/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial3/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial3/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial3/Sender/Sender.csproj index a07cf43f7..e20e30308 100644 --- a/Messaging/src/Tutorials/Tutorial3/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial3/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-C2D2E18A-2CEB-41A7-B14E-12B4C99EDB13 diff --git a/Messaging/src/Tutorials/Tutorial4/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial4/Receiver/Receiver.csproj index 9278de72d..82c29df0b 100644 --- a/Messaging/src/Tutorials/Tutorial4/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial4/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial4/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial4/Sender/Sender.csproj index 7d3a5c0a8..98594b308 100644 --- a/Messaging/src/Tutorials/Tutorial4/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial4/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-B7957B91-4F0F-4F6A-BF26-7DB15BCBF4D6 diff --git a/Messaging/src/Tutorials/Tutorial5/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial5/Receiver/Receiver.csproj index ce8c069bd..01b9eedfe 100644 --- a/Messaging/src/Tutorials/Tutorial5/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial5/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial5/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial5/Sender/Sender.csproj index 00a82653f..b562d0349 100644 --- a/Messaging/src/Tutorials/Tutorial5/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial5/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-98F382B2-A4E4-4F1F-A675-D9A2E3D611BC diff --git a/Messaging/src/Tutorials/Tutorial6/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial6/Receiver/Receiver.csproj index 593f3668b..78a14b06a 100644 --- a/Messaging/src/Tutorials/Tutorial6/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial6/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable true diff --git a/Messaging/src/Tutorials/Tutorial6/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial6/Sender/Sender.csproj index 1c11c11d3..7e43db764 100644 --- a/Messaging/src/Tutorials/Tutorial6/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial6/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-CD180ADB-D917-4FB7-BB6C-8891BC414B49 diff --git a/Messaging/src/Tutorials/Tutorial7/Receiver/Receiver.csproj b/Messaging/src/Tutorials/Tutorial7/Receiver/Receiver.csproj index ce8c069bd..01b9eedfe 100644 --- a/Messaging/src/Tutorials/Tutorial7/Receiver/Receiver.csproj +++ b/Messaging/src/Tutorials/Tutorial7/Receiver/Receiver.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/Messaging/src/Tutorials/Tutorial7/Sender/Sender.csproj b/Messaging/src/Tutorials/Tutorial7/Sender/Sender.csproj index 93e217468..a01a194b9 100644 --- a/Messaging/src/Tutorials/Tutorial7/Sender/Sender.csproj +++ b/Messaging/src/Tutorials/Tutorial7/Sender/Sender.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-Sender-C5FF4FBB-4AD5-435A-9D92-2A519E3770A0 diff --git a/Stream/Basic/Basic.csproj b/Stream/Basic/Basic.csproj index a3bb66bac..6a8281304 100644 --- a/Stream/Basic/Basic.csproj +++ b/Stream/Basic/Basic.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/Basic/Directory.Build.props b/Stream/Basic/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/Basic/Directory.Build.props +++ b/Stream/Basic/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/CloudDataFlowLogSink/CloudDataflowLogSink.csproj b/Stream/CloudDataFlowLogSink/CloudDataflowLogSink.csproj index 727674f5f..35a74cc12 100644 --- a/Stream/CloudDataFlowLogSink/CloudDataflowLogSink.csproj +++ b/Stream/CloudDataFlowLogSink/CloudDataflowLogSink.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 c5463339-59df-4259-9d72-455c72aba99f diff --git a/Stream/CloudDataFlowLogSink/Directory.Build.props b/Stream/CloudDataFlowLogSink/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/CloudDataFlowLogSink/Directory.Build.props +++ b/Stream/CloudDataFlowLogSink/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/CloudDataFlowLogSinkK8s/CloudDataflowLogSinkK8s.csproj b/Stream/CloudDataFlowLogSinkK8s/CloudDataflowLogSinkK8s.csproj index 489ec3071..e6f725951 100644 --- a/Stream/CloudDataFlowLogSinkK8s/CloudDataflowLogSinkK8s.csproj +++ b/Stream/CloudDataFlowLogSinkK8s/CloudDataflowLogSinkK8s.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 c5463339-59df-4259-9d72-455c72aba99f diff --git a/Stream/CloudDataFlowLogSinkK8s/Directory.Build.props b/Stream/CloudDataFlowLogSinkK8s/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/CloudDataFlowLogSinkK8s/Directory.Build.props +++ b/Stream/CloudDataFlowLogSinkK8s/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/CloudDataFlowToUpperProcessor/CloudDataflowToUpperProcessor.csproj b/Stream/CloudDataFlowToUpperProcessor/CloudDataflowToUpperProcessor.csproj index 756732ef0..24c105f9f 100644 --- a/Stream/CloudDataFlowToUpperProcessor/CloudDataflowToUpperProcessor.csproj +++ b/Stream/CloudDataFlowToUpperProcessor/CloudDataflowToUpperProcessor.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 steeltoe_stream_samples 1e63ea3a-bb17-4f88-b5c7-26c2bdea7ff7 Linux diff --git a/Stream/CloudDataFlowToUpperProcessor/Directory.Build.props b/Stream/CloudDataFlowToUpperProcessor/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/CloudDataFlowToUpperProcessor/Directory.Build.props +++ b/Stream/CloudDataFlowToUpperProcessor/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/CloudDataFlowToUpperProcessorK8s/CloudDataflowToUpperProcessorK8s.csproj b/Stream/CloudDataFlowToUpperProcessorK8s/CloudDataflowToUpperProcessorK8s.csproj index 61e80ddb6..074c7e438 100644 --- a/Stream/CloudDataFlowToUpperProcessorK8s/CloudDataflowToUpperProcessorK8s.csproj +++ b/Stream/CloudDataFlowToUpperProcessorK8s/CloudDataflowToUpperProcessorK8s.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 steeltoe_stream_samples 1e63ea3a-bb17-4f88-b5c7-26c2bdea7ff7 Linux diff --git a/Stream/CloudDataFlowToUpperProcessorK8s/Directory.Build.props b/Stream/CloudDataFlowToUpperProcessorK8s/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/CloudDataFlowToUpperProcessorK8s/Directory.Build.props +++ b/Stream/CloudDataFlowToUpperProcessorK8s/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/DynamicDestinationMessaging/Directory.Build.props b/Stream/DynamicDestinationMessaging/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/DynamicDestinationMessaging/Directory.Build.props +++ b/Stream/DynamicDestinationMessaging/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/DynamicDestinationMessaging/DynamicDestinationMessaging.csproj b/Stream/DynamicDestinationMessaging/DynamicDestinationMessaging.csproj index d1c53ce3e..fd92347cf 100644 --- a/Stream/DynamicDestinationMessaging/DynamicDestinationMessaging.csproj +++ b/Stream/DynamicDestinationMessaging/DynamicDestinationMessaging.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/EFCore/Directory.Build.props b/Stream/EFCore/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/EFCore/Directory.Build.props +++ b/Stream/EFCore/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/EFCore/EFCore.csproj b/Stream/EFCore/EFCore.csproj index 2e8c4f3a3..e12baf75f 100644 --- a/Stream/EFCore/EFCore.csproj +++ b/Stream/EFCore/EFCore.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/LoggingConsumerApplication/Directory.Build.props b/Stream/LoggingConsumerApplication/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/LoggingConsumerApplication/Directory.Build.props +++ b/Stream/LoggingConsumerApplication/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/LoggingConsumerApplication/LoggingConsumerApplication.csproj b/Stream/LoggingConsumerApplication/LoggingConsumerApplication.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/LoggingConsumerApplication/LoggingConsumerApplication.csproj +++ b/Stream/LoggingConsumerApplication/LoggingConsumerApplication.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/PartitionedConsumer/Directory.Build.props b/Stream/PartitionedConsumer/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/PartitionedConsumer/Directory.Build.props +++ b/Stream/PartitionedConsumer/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/PartitionedConsumer/PartitionedConsumer.csproj b/Stream/PartitionedConsumer/PartitionedConsumer.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/PartitionedConsumer/PartitionedConsumer.csproj +++ b/Stream/PartitionedConsumer/PartitionedConsumer.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/PartitionedProducer/Directory.Build.props b/Stream/PartitionedProducer/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/PartitionedProducer/Directory.Build.props +++ b/Stream/PartitionedProducer/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/PartitionedProducer/PartitionedProducer.csproj b/Stream/PartitionedProducer/PartitionedProducer.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/PartitionedProducer/PartitionedProducer.csproj +++ b/Stream/PartitionedProducer/PartitionedProducer.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/PolledConsumers/Directory.Build.props b/Stream/PolledConsumers/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/PolledConsumers/Directory.Build.props +++ b/Stream/PolledConsumers/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/PolledConsumers/PolledConsumers.csproj b/Stream/PolledConsumers/PolledConsumers.csproj index 0025a7fac..20c045c54 100644 --- a/Stream/PolledConsumers/PolledConsumers.csproj +++ b/Stream/PolledConsumers/PolledConsumers.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/ReRouteDlq/Directory.Build.props b/Stream/ReRouteDlq/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/ReRouteDlq/Directory.Build.props +++ b/Stream/ReRouteDlq/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/ReRouteDlq/ReRouteDlq.csproj b/Stream/ReRouteDlq/ReRouteDlq.csproj index 61e61aabb..55a8874cf 100644 --- a/Stream/ReRouteDlq/ReRouteDlq.csproj +++ b/Stream/ReRouteDlq/ReRouteDlq.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/ReRouteDlqDelayed/Directory.Build.props b/Stream/ReRouteDlqDelayed/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/ReRouteDlqDelayed/Directory.Build.props +++ b/Stream/ReRouteDlqDelayed/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/ReRouteDlqDelayed/ReRouteDlqDelayed.csproj b/Stream/ReRouteDlqDelayed/ReRouteDlqDelayed.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/ReRouteDlqDelayed/ReRouteDlqDelayed.csproj +++ b/Stream/ReRouteDlqDelayed/ReRouteDlqDelayed.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/ReRouteDlqRepublishToDlqFalse/Directory.Build.props b/Stream/ReRouteDlqRepublishToDlqFalse/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/ReRouteDlqRepublishToDlqFalse/Directory.Build.props +++ b/Stream/ReRouteDlqRepublishToDlqFalse/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/ReRouteDlqRepublishToDlqFalse/ReRouteDlqRepublishToDlqFalse.csproj b/Stream/ReRouteDlqRepublishToDlqFalse/ReRouteDlqRepublishToDlqFalse.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/ReRouteDlqRepublishToDlqFalse/ReRouteDlqRepublishToDlqFalse.csproj +++ b/Stream/ReRouteDlqRepublishToDlqFalse/ReRouteDlqRepublishToDlqFalse.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/ReRouteDlqRepublishToDlqTrue/Directory.Build.props b/Stream/ReRouteDlqRepublishToDlqTrue/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/ReRouteDlqRepublishToDlqTrue/Directory.Build.props +++ b/Stream/ReRouteDlqRepublishToDlqTrue/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/ReRouteDlqRepublishToDlqTrue/ReRouteDlqRepublishToDlqTrue.csproj b/Stream/ReRouteDlqRepublishToDlqTrue/ReRouteDlqRepublishToDlqTrue.csproj index 8d90edca4..d01406baa 100644 --- a/Stream/ReRouteDlqRepublishToDlqTrue/ReRouteDlqRepublishToDlqTrue.csproj +++ b/Stream/ReRouteDlqRepublishToDlqTrue/ReRouteDlqRepublishToDlqTrue.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/TestPocoWithAnnotatedArguments/Directory.Build.props b/Stream/TestPocoWithAnnotatedArguments/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/TestPocoWithAnnotatedArguments/Directory.Build.props +++ b/Stream/TestPocoWithAnnotatedArguments/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/TestPocoWithAnnotatedArguments/TestPocoWithAnnotatedArguments.csproj b/Stream/TestPocoWithAnnotatedArguments/TestPocoWithAnnotatedArguments.csproj index 0025a7fac..20c045c54 100644 --- a/Stream/TestPocoWithAnnotatedArguments/TestPocoWithAnnotatedArguments.csproj +++ b/Stream/TestPocoWithAnnotatedArguments/TestPocoWithAnnotatedArguments.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/TransformProcessor/Directory.Build.props b/Stream/TransformProcessor/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/TransformProcessor/Directory.Build.props +++ b/Stream/TransformProcessor/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/TransformProcessor/TransformProcessor.csproj b/Stream/TransformProcessor/TransformProcessor.csproj index 54f247f2c..87a4a699d 100644 --- a/Stream/TransformProcessor/TransformProcessor.csproj +++ b/Stream/TransformProcessor/TransformProcessor.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Linux 10.0 diff --git a/Stream/UsageCost/UsageLogger/Directory.Build.props b/Stream/UsageCost/UsageLogger/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/UsageCost/UsageLogger/Directory.Build.props +++ b/Stream/UsageCost/UsageLogger/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/UsageCost/UsageLogger/UsageLogger.csproj b/Stream/UsageCost/UsageLogger/UsageLogger.csproj index d83f80c4c..b675af23e 100644 --- a/Stream/UsageCost/UsageLogger/UsageLogger.csproj +++ b/Stream/UsageCost/UsageLogger/UsageLogger.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Linux 7.1 diff --git a/Stream/UsageCost/UsageProcessor/Directory.Build.props b/Stream/UsageCost/UsageProcessor/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/UsageCost/UsageProcessor/Directory.Build.props +++ b/Stream/UsageCost/UsageProcessor/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/UsageCost/UsageProcessor/UsageProcessor.csproj b/Stream/UsageCost/UsageProcessor/UsageProcessor.csproj index d83f80c4c..b675af23e 100644 --- a/Stream/UsageCost/UsageProcessor/UsageProcessor.csproj +++ b/Stream/UsageCost/UsageProcessor/UsageProcessor.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Linux 7.1 diff --git a/Stream/UsageCost/UsageSender/Directory.Build.props b/Stream/UsageCost/UsageSender/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/UsageCost/UsageSender/Directory.Build.props +++ b/Stream/UsageCost/UsageSender/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/UsageCost/UsageSender/UsageSender.csproj b/Stream/UsageCost/UsageSender/UsageSender.csproj index a18c78b23..d4826761a 100644 --- a/Stream/UsageCost/UsageSender/UsageSender.csproj +++ b/Stream/UsageCost/UsageSender/UsageSender.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 diff --git a/Stream/VoteHandler/Directory.Build.props b/Stream/VoteHandler/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/VoteHandler/Directory.Build.props +++ b/Stream/VoteHandler/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/VoteHandler/VoteHandler.csproj b/Stream/VoteHandler/VoteHandler.csproj index 2dc4f90e4..0bce0ec07 100644 --- a/Stream/VoteHandler/VoteHandler.csproj +++ b/Stream/VoteHandler/VoteHandler.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/Stream/XDeathApplication/Directory.Build.props b/Stream/XDeathApplication/Directory.Build.props index d719a6c23..ff178bf11 100644 --- a/Stream/XDeathApplication/Directory.Build.props +++ b/Stream/XDeathApplication/Directory.Build.props @@ -8,7 +8,7 @@ 2.3.0 13.0.1 5.1.2 - 6.0.* - 6.0.* + 8.0.* + 8.0.* diff --git a/Stream/XDeathApplication/XDeathApplication.csproj b/Stream/XDeathApplication/XDeathApplication.csproj index 6b9d5607c..d1e9aa161 100644 --- a/Stream/XDeathApplication/XDeathApplication.csproj +++ b/Stream/XDeathApplication/XDeathApplication.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10.0 diff --git a/config/Directory.Build.net60.props b/config/Directory.Build.net60.props deleted file mode 100644 index d719a6c23..000000000 --- a/config/Directory.Build.net60.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - 3.3.* - $(NoWarn);CS0618 - - - 2.3.0 - 13.0.1 - 5.1.2 - 6.0.* - 6.0.* - - diff --git a/configure.ps1 b/configure.ps1 index 7473e45c9..66542fd91 100644 --- a/configure.ps1 +++ b/configure.ps1 @@ -13,18 +13,6 @@ $repoRoot = "$PSScriptRoot" $global:seenProjectFiles = @() $global:seenPropsFiles = @() -function syncNet60() { - $sourceFilePath = Resolve-Path -Path "$repoRoot/config/Directory.Build.net60.props" - foreach ($projectFilePath in Get-ChildItem -Path $repoRoot -Recurse -Filter '*.csproj' | where { $_ | Select-String -SimpleMatch 'net6.0' }) { - $targetDir = Split-Path -Parent $projectFilePath - $targetFilePath = Join-Path -Path $targetDir -ChildPath 'Directory.Build.props' - Copy-Item $sourceFilePath -Destination $targetFilePath -Force - - $global:seenProjectFiles += $projectFilePath.FullName - $global:seenPropsFiles += $targetFilePath - } -} - function syncNet80() { $sourceFilePath = Resolve-Path -Path "$repoRoot/config/Directory.Build.net80.props" foreach ($projectFilePath in Get-ChildItem -Path $repoRoot -Recurse -Filter '*.csproj' | where { $_ | Select-String -SimpleMatch 'net8.0' }) { @@ -50,7 +38,5 @@ function verify() { } } -syncNet60 syncNet80 verify - From b0ca7251a4c26beec037388992ce12a1480f943b Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Wed, 6 May 2026 14:47:48 +0200 Subject: [PATCH 2/3] Update OpenTelemetry packages --- .../Fortune-Teller-Service/Fortune-Teller-Service.csproj | 2 +- .../src/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj | 2 +- MusicStore/src/MusicStoreService/MusicStoreService.csproj | 2 +- MusicStore/src/MusicStoreUI/MusicStoreUI.csproj | 2 +- MusicStore/src/OrderService/OrderService.csproj | 2 +- MusicStore/src/ShoppingCartService/ShoppingCartService.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Management/src/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj b/Management/src/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj index f9e9e0095..a37450ff5 100644 --- a/Management/src/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj +++ b/Management/src/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj @@ -19,7 +19,7 @@ - + diff --git a/Management/src/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj b/Management/src/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj index fd4221c57..d045d1115 100644 --- a/Management/src/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj +++ b/Management/src/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj @@ -3,7 +3,7 @@ net8.0 - + diff --git a/MusicStore/src/MusicStoreService/MusicStoreService.csproj b/MusicStore/src/MusicStoreService/MusicStoreService.csproj index ec452fec6..08614b570 100644 --- a/MusicStore/src/MusicStoreService/MusicStoreService.csproj +++ b/MusicStore/src/MusicStoreService/MusicStoreService.csproj @@ -16,7 +16,7 @@ - + diff --git a/MusicStore/src/MusicStoreUI/MusicStoreUI.csproj b/MusicStore/src/MusicStoreUI/MusicStoreUI.csproj index edcc0bea2..43c4571a8 100644 --- a/MusicStore/src/MusicStoreUI/MusicStoreUI.csproj +++ b/MusicStore/src/MusicStoreUI/MusicStoreUI.csproj @@ -22,7 +22,7 @@ - + diff --git a/MusicStore/src/OrderService/OrderService.csproj b/MusicStore/src/OrderService/OrderService.csproj index 27f7523c9..bf5f42352 100644 --- a/MusicStore/src/OrderService/OrderService.csproj +++ b/MusicStore/src/OrderService/OrderService.csproj @@ -15,7 +15,7 @@ - + diff --git a/MusicStore/src/ShoppingCartService/ShoppingCartService.csproj b/MusicStore/src/ShoppingCartService/ShoppingCartService.csproj index 382657118..a1bf9d008 100644 --- a/MusicStore/src/ShoppingCartService/ShoppingCartService.csproj +++ b/MusicStore/src/ShoppingCartService/ShoppingCartService.csproj @@ -15,7 +15,7 @@ - + From 3432a5f01a5b8f1af262ce02311eff0564387fe4 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Wed, 6 May 2026 15:02:19 +0200 Subject: [PATCH 3/3] Fixed: failed to start when nuget.config is missing --- Configuration/src/Kubernetes/Dockerfile | 2 +- Discovery/src.Docker/Fortune-Teller-Service/Dockerfile | 2 +- Discovery/src.Docker/Fortune-Teller-UI/Dockerfile | 2 +- Management/src/Kubernetes/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Configuration/src/Kubernetes/Dockerfile b/Configuration/src/Kubernetes/Dockerfile index 8931a1058..06f1930a6 100644 --- a/Configuration/src/Kubernetes/Dockerfile +++ b/Configuration/src/Kubernetes/Dockerfile @@ -8,7 +8,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["Kubernetes.csproj", ""] COPY ["Directory.Build.props", ""] -COPY ["nuget.config", ""] +COPY ["nuget.config*", ""] RUN dotnet restore "Kubernetes.csproj" COPY . . WORKDIR "/src" diff --git a/Discovery/src.Docker/Fortune-Teller-Service/Dockerfile b/Discovery/src.Docker/Fortune-Teller-Service/Dockerfile index c4b66b38c..a06b8c845 100644 --- a/Discovery/src.Docker/Fortune-Teller-Service/Dockerfile +++ b/Discovery/src.Docker/Fortune-Teller-Service/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder WORKDIR /src COPY ["Fortune-Teller-Service/FortuneTeller.Service.csproj", "Fortune-Teller-Service/"] COPY ["Fortune-Teller-Service/Directory.Build.props", "Fortune-Teller-Service/"] -COPY ["Fortune-Teller-Service/nuget.config", "Fortune-Teller-Service/"] +COPY ["Fortune-Teller-Service/nuget.config*", "Fortune-Teller-Service/"] RUN dotnet restore "Fortune-Teller-Service/" COPY . . RUN dotnet publish "Fortune-Teller-Service/" -c Release -o /app -f net8.0 diff --git a/Discovery/src.Docker/Fortune-Teller-UI/Dockerfile b/Discovery/src.Docker/Fortune-Teller-UI/Dockerfile index 0add71453..3148679f4 100644 --- a/Discovery/src.Docker/Fortune-Teller-UI/Dockerfile +++ b/Discovery/src.Docker/Fortune-Teller-UI/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder WORKDIR /src COPY ["Fortune-Teller-UI/FortuneTeller.UI.csproj", "Fortune-Teller-UI/"] COPY ["Fortune-Teller-UI/Directory.Build.props", "Fortune-Teller-UI/"] -COPY ["Fortune-Teller-UI/nuget.config", "Fortune-Teller-UI/"] +COPY ["Fortune-Teller-UI/nuget.config*", "Fortune-Teller-UI/"] RUN dotnet restore "Fortune-Teller-UI/" COPY . . RUN dotnet publish "Fortune-Teller-UI/" -c Release -o /app -f net8.0 diff --git a/Management/src/Kubernetes/Dockerfile b/Management/src/Kubernetes/Dockerfile index 9a3be538f..f45d86800 100644 --- a/Management/src/Kubernetes/Dockerfile +++ b/Management/src/Kubernetes/Dockerfile @@ -9,7 +9,7 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["Kubernetes.csproj", ""] COPY ["Directory.Build.props", ""] -COPY ["nuget.config", ""] +COPY ["nuget.config*", ""] RUN dotnet restore "Kubernetes.csproj" COPY . . WORKDIR "/src"