Skip to content

Commit 9e04b46

Browse files
Sync changes from main to net8 - Applied recent commits, updated versions & framework, preserved .csproj files (#567)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 3c5891f commit 9e04b46

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageTags>ticker;queue;cron;time;scheduler;fire-and-forget</PackageTags>
99
<PackageIcon>icon.jpg</PackageIcon>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<Version>8.0.5.2-beta</Version>
11+
<Version>8.1.0-beta</Version>
1212
<DotNetVersion>[10.0.0,11.0.0)</DotNetVersion>
1313
<LangVersion>latest</LangVersion>
1414
</PropertyGroup>

src/TickerQ.RemoteExecutor/Models/RegisteredFunctionsResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public sealed class Function
2727
public string FunctionName { get; set; } = string.Empty;
2828
public string RequestType { get; set; } = string.Empty;
2929
public string? RequestExampleJson { get; set; }
30-
public string? CronExpression { get; set; }
30+
public string? NodeExpression { get; set; }
3131
public int TaskPriority { get; set; }
3232
public DateTime? AppliedAt { get; set; }
3333
public bool IsActive { get; set; }

src/TickerQ.RemoteExecutor/RemoteFunctionsSyncService.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
using System.Text.Json;
2-
using Microsoft.Extensions.DependencyInjection;
3-
using Microsoft.Extensions.Hosting;
4-
using Microsoft.Extensions.Logging;
52
using TickerQ.RemoteExecutor.Models;
63
using TickerQ.Utilities;
74
using TickerQ.Utilities.Enums;
@@ -185,15 +182,15 @@ private async Task RegisterFunctionsFromResponse(RegisteredFunctionsResponse res
185182
var priority = (TickerTaskPriority)function.TaskPriority;
186183

187184
// Use cronExpression if available
188-
var cronExpression = function.CronExpression ?? string.Empty;
185+
var cronExpression = function.NodeExpression ?? string.Empty;
189186

190187
functionDict[function.FunctionName] = (cronExpression, priority, functionDelegate);
191188
RemoteFunctionRegistry.MarkRemote(function.FunctionName);
192189
requestInfoDict[function.FunctionName] = (
193190
function.RequestType,
194191
function.RequestExampleJson ?? string.Empty);
195192

196-
if (!string.IsNullOrWhiteSpace(cronExpression))
193+
if (node.AutoMigrateExpressions && !string.IsNullOrWhiteSpace(cronExpression))
197194
{
198195
cronPairs.Add((function.FunctionName, cronExpression));
199196
}

src/TickerQ.SDK/Infrastructure/TickerQFunctionSyncService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public TickerQFunctionSyncService(TickerQSdkHttpClient client, TickerSdkOptions
4444
RequestType = requestType.Item1 ?? string.Empty,
4545
RequestExampleJson = exampleJson,
4646
TaskPriority = priority,
47-
CronExpression = cronExpression
47+
Expression = cronExpression
4848
});
4949
}
5050

src/TickerQ.SDK/Models/NodeFunction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ public sealed class NodeFunction
88
public string RequestType { get; set; }
99
public string RequestExampleJson { get; set; } = string.Empty;
1010
public TickerTaskPriority TaskPriority { get; set; }
11-
public string CronExpression { get; set; }
11+
public string Expression { get; set; }
1212
}

0 commit comments

Comments
 (0)