Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,25 @@
s => s.SetProperty(x => x.RetryCount, functionContext.RetryCount));

if (propsToUpdate.Contains(nameof(InternalFunctionContext.ReleaseLock)))
<<<<<<< HEAD

Check failure on line 120 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered

Check failure on line 120 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered
setExpression = ExpressionHelper.CombineSetters(setExpression,
s => s.SetProperty(x => x.LockHolder, (string)null)
.SetProperty(x => x.LockedAt, (DateTime?)null));

return setExpression;
=======

Check failure on line 126 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered

Check failure on line 126 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered
{
setters
.SetProperty(x => x.LockHolder, (string)null)
.SetProperty(x => x.LockedAt, (DateTime?)null);
}

// EXECUTION TIME
if (propsToUpdate.Contains(nameof(InternalFunctionContext.ExecutionTime)))
{
setters.SetProperty(x => x.ExecutionTime, functionContext.ExecutionTime);
}
>>>>>>> 298ca68 (fix update ExecutionTime for CronTickerOccurrence (#461))

Check failure on line 138 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered

Check failure on line 138 in src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs

View workflow job for this annotation

GitHub Actions / PR Build and Test

Merge conflict marker encountered
}

internal static Expression<Func<SetPropertyCalls<TTimeTicker>, SetPropertyCalls<TTimeTicker>>> UpdateTimeTicker<TTimeTicker>(InternalFunctionContext functionContext, DateTime updatedAt)
Expand Down
Loading