From 522424ac4030ce6032be6a02a2a0b0d89db4a7a1 Mon Sep 17 00:00:00 2001 From: Chris Gillum Date: Fri, 30 May 2025 17:34:57 -0700 Subject: [PATCH 1/4] Updating dependencies to resolve component governance issues --- Directory.Packages.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 789dd1cad..2cd95c3a1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,15 +10,15 @@ - - - - + + + + - + @@ -76,16 +76,16 @@ - - - + + + - + From 157ccea54d549b795f3273c2d4a16a1628203756 Mon Sep 17 00:00:00 2001 From: Chris Gillum Date: Tue, 17 Jun 2025 10:02:32 -0700 Subject: [PATCH 2/4] Fix warnings and update Azure.Core dependency --- Directory.Packages.props | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2cd95c3a1..c742e18af 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -23,7 +23,6 @@ - @@ -54,8 +53,6 @@ - - @@ -104,12 +101,18 @@ - + + + + + + + From 84f1baff162da3949ab1e03e65153a4ab039cadb Mon Sep 17 00:00:00 2001 From: Chris Gillum Date: Tue, 17 Jun 2025 10:36:35 -0700 Subject: [PATCH 3/4] Remove netcoreapp3.1 and update other references --- Directory.Packages.props | 8 ++++---- samples/Correlation.Samples/Correlation.Samples.csproj | 2 +- .../DurableTask.AzureStorage.csproj | 1 - .../DurableTask.ServiceBus.Tests.csproj | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c742e18af..e9c7569ca 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -51,7 +51,7 @@ - + @@ -65,15 +65,15 @@ - - + + - + diff --git a/samples/Correlation.Samples/Correlation.Samples.csproj b/samples/Correlation.Samples/Correlation.Samples.csproj index f25b8e8e0..d3c206a21 100644 --- a/samples/Correlation.Samples/Correlation.Samples.csproj +++ b/samples/Correlation.Samples/Correlation.Samples.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj index fc3bdf2c2..431c83194 100644 --- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj +++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj @@ -40,7 +40,6 @@ - diff --git a/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj b/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj index 0ac095bc1..6c01bd849 100644 --- a/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj +++ b/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp3.1;net462 + net6.0;net462 @@ -28,7 +28,7 @@ - + @@ -60,7 +60,7 @@ - + PreserveNewest From e924b154a1fa164f037bf73008eb52d65f04ec95 Mon Sep 17 00:00:00 2001 From: Chris Gillum Date: Tue, 17 Jun 2025 12:52:21 -0700 Subject: [PATCH 4/4] Fix build warning --- .../DurableTaskCorrelationTelemetryInitializer.cs | 2 +- .../OrchestrationHubTableClientTests.cs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/samples/Correlation.Samples/DurableTaskCorrelationTelemetryInitializer.cs b/samples/Correlation.Samples/DurableTaskCorrelationTelemetryInitializer.cs index 15e364599..888483f29 100644 --- a/samples/Correlation.Samples/DurableTaskCorrelationTelemetryInitializer.cs +++ b/samples/Correlation.Samples/DurableTaskCorrelationTelemetryInitializer.cs @@ -313,7 +313,7 @@ internal static void UpdateTelemetry(ITelemetry telemetry, Activity activity, bo if (initializeFromCurrent) { opTelemetry.Id = activity.SpanId.ToHexString(); - if (activity.ParentSpanId != null) + if (activity.ParentSpanId != default) { opTelemetry.Context.Operation.ParentId = activity.ParentSpanId.ToHexString(); } diff --git a/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs b/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs index b25c23953..afbcf83f9 100644 --- a/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs +++ b/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs @@ -274,14 +274,14 @@ bool CompareEnumerations(IEnumerable expected, I return true; } - bool CompareHistoryEntity(AzureTableOrchestrationHistoryEventEntity expected, AzureTableOrchestrationHistoryEventEntity actual) + static bool CompareHistoryEntity(AzureTableOrchestrationHistoryEventEntity expected, AzureTableOrchestrationHistoryEventEntity actual) { // TODO : history comparison! return expected.InstanceId.Equals(actual.InstanceId) && expected.ExecutionId.Equals(actual.ExecutionId) && expected.SequenceNumber == actual.SequenceNumber; } - bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableOrchestrationStateEntity actual) + static bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableOrchestrationStateEntity actual) { return expected.State.OrchestrationInstance.InstanceId.Equals(actual.State.OrchestrationInstance.InstanceId) && @@ -289,8 +289,7 @@ bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableO expected.State.Name.Equals(actual.State.Name) && expected.State.CreatedTime.Equals(actual.State.CreatedTime) && expected.State.LastUpdatedTime.Equals(actual.State.LastUpdatedTime) && - // ReSharper disable once ConditionIsAlwaysTrueOrFalse - (expected.State.CompletedTime == null && actual.State.CompletedTime == null || + (expected.State.CompletedTime == default && actual.State.CompletedTime == default || expected.State.CompletedTime.Equals(actual.State.CompletedTime)) && expected.State.Status.Equals(actual.State.Status) && expected.State.Input.Equals(actual.State.Input) && @@ -298,7 +297,7 @@ bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableO expected.State.Output.Equals(actual.State.Output)); } - IEnumerable CreateHistoryEntities(AzureTableClient azureTableClient, string instanceId, + static IEnumerable CreateHistoryEntities(AzureTableClient azureTableClient, string instanceId, string genId, int count) { var historyEntities = new List(); @@ -314,7 +313,7 @@ IEnumerable CreateHistoryEntities(Azu return historyEntities; } - IEnumerable CreateStateEntities(AzureTableClient azureTableClient, string instanceId, string genId) + static IEnumerable CreateStateEntities(AzureTableClient azureTableClient, string instanceId, string genId) { var entities = new List(); var runtimeState = new OrchestrationState