diff --git a/Common/src/ArmoniK.Core.Common.csproj b/Common/src/ArmoniK.Core.Common.csproj index 3884333b9..57f549827 100644 --- a/Common/src/ArmoniK.Core.Common.csproj +++ b/Common/src/ArmoniK.Core.Common.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Common/src/gRPC/Convertors/TaskDataHolderExt.cs b/Common/src/gRPC/Convertors/TaskDataHolderExt.cs index b6dafb7ee..d38a1d655 100644 --- a/Common/src/gRPC/Convertors/TaskDataHolderExt.cs +++ b/Common/src/gRPC/Convertors/TaskDataHolderExt.cs @@ -37,6 +37,7 @@ public static TaskDetailed ToTaskDetailed(this TaskDataHolder taskData) => new() { SessionId = taskData.SessionId, + PayloadId = taskData.PayloadId, Status = taskData.Status.ToGrpcStatus(), Output = taskData.Output is not null ? new TaskDetailed.Types.Output @@ -117,6 +118,7 @@ public static TaskSummary ToTaskSummary(this TaskDataHolder taskDataSummary) => new() { SessionId = taskDataSummary.SessionId, + PayloadId = taskDataSummary.PayloadId, Status = taskDataSummary.Status.ToGrpcStatus(), OwnerPodId = taskDataSummary.OwnerPodId, Options = taskDataSummary.Options?.ToGrpcTaskOptions(), diff --git a/Common/src/gRPC/EnumFieldExt.cs b/Common/src/gRPC/EnumFieldExt.cs index 54d1d98aa..2e0906f83 100644 --- a/Common/src/gRPC/EnumFieldExt.cs +++ b/Common/src/gRPC/EnumFieldExt.cs @@ -58,6 +58,7 @@ public static class EnumFieldExt { TaskSummaryEnumField.TaskId => data => data.TaskId, TaskSummaryEnumField.SessionId => data => data.SessionId, + TaskSummaryEnumField.PayloadId => data => data.PayloadId, TaskSummaryEnumField.OwnerPodId => data => data.OwnerPodId, TaskSummaryEnumField.InitialTaskId => data => data.InitialTaskId, TaskSummaryEnumField.Status => data => data.Status, diff --git a/Common/src/gRPC/Services/GrpcTasksService.cs b/Common/src/gRPC/Services/GrpcTasksService.cs index 43494878e..8fd76ac7d 100644 --- a/Common/src/gRPC/Services/GrpcTasksService.cs +++ b/Common/src/gRPC/Services/GrpcTasksService.cs @@ -106,6 +106,7 @@ public GrpcTasksService(ITaskTable taskTable, { TaskDataFields.SessionId, TaskDataFields.TaskId, + TaskDataFields.PayloadId, TaskDataFields.Status, TaskDataFields.InitialTaskId, TaskDataFields.Output, @@ -481,7 +482,8 @@ await TaskLifeCycleHelper.FinalizeTaskCreation(taskTable_, { creationRequest.ExpectedOutputKeys, }, - TaskId = creationRequest.TaskId, + TaskId = creationRequest.TaskId, + PayloadId = creationRequest.PayloadId, }), }, }; diff --git a/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs b/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs index 2f90463d7..2d2aba475 100644 --- a/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs +++ b/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs @@ -93,6 +93,7 @@ public override ValidationResult Validate(ValidationContext - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj b/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj index 409e2dbc2..7265b56fe 100644 --- a/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj +++ b/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj b/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj index a79f875b7..0fd51f019 100644 --- a/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj +++ b/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj b/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj index e2effb407..25490cb50 100644 --- a/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj +++ b/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj @@ -35,7 +35,7 @@ - + diff --git a/Tests/CrashingWorker/Server/src/ArmoniK.Samples.CrashingWorker.Server.csproj b/Tests/CrashingWorker/Server/src/ArmoniK.Samples.CrashingWorker.Server.csproj index 8ca6e4b1b..94cdc9d92 100644 --- a/Tests/CrashingWorker/Server/src/ArmoniK.Samples.CrashingWorker.Server.csproj +++ b/Tests/CrashingWorker/Server/src/ArmoniK.Samples.CrashingWorker.Server.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj b/Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj index 6e40b3050..da7fcd7d4 100644 --- a/Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj +++ b/Tests/HtcMock/Server/src/ArmoniK.Samples.HtcMock.Server.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj b/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj index 314680e22..135fe4d39 100644 --- a/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj +++ b/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj b/Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj index 4f0a60d92..3f4eee2cc 100644 --- a/Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj +++ b/Tests/Stream/Server/ArmoniK.Extensions.Common.StreamWrapper.Tests.Server.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive