Merge remote-tracking branch 'origin/main' into develop/3.7.0
This commit is contained in:
commit
ae1bb77dec
3
.github/workflows/copilot-setup-steps.yml
vendored
3
.github/workflows/copilot-setup-steps.yml
vendored
|
|
@ -17,3 +17,6 @@ jobs:
|
|||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: "10.0.x"
|
||||
|
||||
- name: Build, test, and pack
|
||||
run: ./build.cmd Compile Test Pack
|
||||
|
|
|
|||
2
.github/workflows/elsa-server.yml
vendored
2
.github/workflows/elsa-server.yml
vendored
|
|
@ -29,7 +29,7 @@ jobs:
|
|||
with:
|
||||
# list of Docker images to use as base name for tags
|
||||
images: |
|
||||
elsaworkflows/elsa-server-v3-6-preview
|
||||
elsaworkflows/elsa-server-v3-7-0-preview
|
||||
flavor: |
|
||||
latest=true
|
||||
# generate Docker tags based on the following events/attributes
|
||||
|
|
|
|||
2
.github/workflows/packages.yml
vendored
2
.github/workflows/packages.yml
vendored
|
|
@ -17,7 +17,7 @@ on:
|
|||
types: [prereleased, published]
|
||||
|
||||
env:
|
||||
base_version: '3.6.0'
|
||||
base_version: '3.7.0'
|
||||
feedz_feed_source: 'https://f.feedz.io/elsa-workflows/elsa-3/nuget/index.json'
|
||||
nuget_feed_source: 'https://api.nuget.org/v3/index.json'
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
[](https://discord.gg/hhChk5H472)
|
||||
[]( http://stackoverflow.com/questions/tagged/elsa-workflows )
|
||||
[](https://gurubase.io/g/elsa)
|
||||
[](https://deepwiki.com/elsa-workflows/elsa-core)
|
||||
<!-- DeepWiki badge generated by https://deepwiki.ryoppippi.com/ -->
|
||||
|
||||
### [For Elsa 2, Click Here](https://github.com/elsa-workflows/elsa-core/tree/2.x)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ public class JsonContentFactory : IHttpContentFactory
|
|||
/// <inheritdoc />
|
||||
public IEnumerable<string> SupportedContentTypes => [MediaTypeNames.Application.Json, "text/json"];
|
||||
|
||||
private static readonly UTF8Encoding _utf8Encoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
|
||||
|
||||
/// <inheritdoc />
|
||||
[RequiresUnreferencedCode("The JsonSerializer type is not trim-compatible.")]
|
||||
public HttpContent CreateHttpContent(object content, string contentType)
|
||||
|
|
@ -22,6 +24,6 @@ public class JsonContentFactory : IHttpContentFactory
|
|||
if (string.IsNullOrWhiteSpace(contentType))
|
||||
contentType = MediaTypeNames.Application.Json;
|
||||
|
||||
return new RawStringContent(text, Encoding.UTF8, contentType);
|
||||
return new RawStringContent(text, _utf8Encoding, contentType);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Elsa.Extensions;
|
||||
|
||||
namespace Elsa.Scheduling.Services;
|
||||
|
||||
|
|
@ -71,6 +73,7 @@ public class LocalScheduler : IScheduler
|
|||
return ValueTask.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
private void RegisterScheduledTask(string name, IScheduledTask scheduledTask, IEnumerable<string>? keys = null)
|
||||
{
|
||||
_scheduledTasks.AddOrUpdate(
|
||||
|
|
@ -88,6 +91,7 @@ public class LocalScheduler : IScheduler
|
|||
if (keys != null)
|
||||
_scheduledTaskKeys[scheduledTask] = keys.ToList();
|
||||
}
|
||||
|
||||
|
||||
private void RemoveScheduledTask(string name)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue