Update packages

This commit is contained in:
Sipke Schoorstra 2020-04-19 15:39:28 +02:00
parent 822f4146c8
commit dd0e123828
31 changed files with 97 additions and 71 deletions

View file

@ -38,8 +38,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.UserTask",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Activities.Dropbox", "src\activities\Elsa.Activities.Dropbox\Elsa.Activities.Dropbox.csproj", "{5A3C9D59-21FE-4BE3-A00A-FF3F198EEC97}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripting", "scripting", "{5E230C5F-7A64-4E95-A790-DF40CC66DA31}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Scripting.Liquid", "src\scripting\Elsa.Scripting.Liquid\Elsa.Scripting.Liquid.csproj", "{9A2D1E3E-328F-4E02-86F8-84974925C1E3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa", "src\core\Elsa\Elsa.csproj", "{ED2A4FE5-821B-46F7-B72F-E66DE0D66C93}"

View file

@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
</ItemGroup>
</Project>

View file

@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MailKit" Version="2.4.1" />
<PackageReference Include="MailKit" Version="2.6.0" />
</ItemGroup>
</Project>

View file

@ -1,6 +1,5 @@
using System;
using Elsa.Builders;
using Microsoft.AspNetCore.Http;
// ReSharper disable once CheckNamespace
namespace Elsa.Activities.Http

View file

@ -2,7 +2,6 @@ using System;
using Elsa.Builders;
using Elsa.Expressions;
using Elsa.Services.Models;
using Microsoft.AspNetCore.Http;
// ReSharper disable once CheckNamespace
namespace Elsa.Activities.Http

View file

@ -36,11 +36,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
</ItemGroup>
</Project>

View file

@ -29,10 +29,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MassTransit.AspNetCore" Version="6.0.1" />
<PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="MassTransit.Quartz" Version="6.0.1" />
<PackageReference Include="MassTransit.RabbitMQ" Version="6.0.1" />
<PackageReference Include="MassTransit.AspNetCore" Version="6.2.4" />
<PackageReference Include="MassTransit.Extensions.DependencyInjection" Version="6.2.4" />
<PackageReference Include="MassTransit.Quartz" Version="6.2.4" />
<PackageReference Include="MassTransit.RabbitMQ" Version="6.2.4" />
</ItemGroup>
<ItemGroup>

View file

@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.3" />
<PackageReference Include="NCrontab" Version="3.3.1" />
</ItemGroup>

View file

@ -1,5 +1,3 @@
using System;
using Elsa.Services;
using Elsa.Services.Models;
namespace Elsa.Builders

View file

@ -27,16 +27,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MediatR" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="3.1.1" />
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NodaTime" Version="3.0.0-beta01" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.2.0" />
<PackageReference Include="Rebus" Version="5.4.1" />
<PackageReference Include="Rebus" Version="6.1.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
</Project>

View file

@ -7,7 +7,7 @@ namespace Elsa.Expressions
{
public interface IExpressionEvaluator
{
Task<object> EvaluateAsync(IWorkflowExpression expression, Type returnType, ActivityExecutionContext context, CancellationToken cancellationToken = default);
Task<T> EvaluateAsync<T>(IWorkflowExpression<T> expression, ActivityExecutionContext context, CancellationToken cancellationToken = default);
Task<object> EvaluateAsync(IWorkflowExpression? expression, Type returnType, ActivityExecutionContext context, CancellationToken cancellationToken = default);
Task<T> EvaluateAsync<T>(IWorkflowExpression<T>? expression, ActivityExecutionContext context, CancellationToken cancellationToken = default);
}
}

View file

@ -1,5 +1,3 @@
using Elsa.Models;
namespace Elsa.Messaging.Distributed
{
public class RunWorkflow

View file

@ -24,13 +24,13 @@ namespace Elsa.Services.Models
public Variable? Output { get; set; }
public IReadOnlyCollection<string> Outcomes { get; set; }
public Task<T> EvaluateAsync<T>(IWorkflowExpression<T> expression, CancellationToken cancellationToken) =>
public Task<T> EvaluateAsync<T>(IWorkflowExpression<T>? expression, CancellationToken cancellationToken) =>
WorkflowExecutionContext.EvaluateAsync(expression, this, cancellationToken);
public Task<object> EvaluateAsync(IWorkflowExpression expression, Type targetType, CancellationToken cancellationToken) =>
public Task<object> EvaluateAsync(IWorkflowExpression? expression, Type targetType, CancellationToken cancellationToken) =>
WorkflowExecutionContext.EvaluateAsync(expression, targetType, this, cancellationToken);
public Task<object> EvaluateAsync(IWorkflowExpression expression, CancellationToken cancellationToken) =>
public Task<object> EvaluateAsync(IWorkflowExpression? expression, CancellationToken cancellationToken) =>
WorkflowExecutionContext.EvaluateAsync(expression, typeof(object), this, cancellationToken);
public void SetVariable(string name, object value) => WorkflowExecutionContext.SetVariable(name, value);

View file

@ -97,10 +97,10 @@ namespace Elsa.Services.Models
public object GetVariable(string name) => Variables.GetVariable(name);
public void CompletePass() => IsFirstPass = false;
public Task<T> EvaluateAsync<T>(IWorkflowExpression<T> expression, ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken) =>
public Task<T> EvaluateAsync<T>(IWorkflowExpression<T>? expression, ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken) =>
ExpressionEvaluator.EvaluateAsync(expression, activityExecutionContext, cancellationToken);
public Task<object> EvaluateAsync(IWorkflowExpression expression, Type targetType, ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken) =>
public Task<object> EvaluateAsync(IWorkflowExpression? expression, Type targetType, ActivityExecutionContext activityExecutionContext, CancellationToken cancellationToken) =>
ExpressionEvaluator.EvaluateAsync(expression, targetType, activityExecutionContext, cancellationToken);
public void Suspend()

View file

@ -1,6 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Elsa.Builders;
using Elsa.Expressions;
using Elsa.Services.Models;

View file

@ -1,6 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Elsa.Builders;
using Elsa.Expressions;
using Elsa.Services.Models;

View file

@ -29,23 +29,22 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="9.0.0" />
<PackageReference Include="Humanizer.Core" Version="2.7.9" />
<PackageReference Include="MediatR" Version="8.0.0" />
<PackageReference Include="Humanizer.Core" Version="2.8.2" />
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.3" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.2.0" />
<PackageReference Include="Elsa.Scrutor" Version="3.0.2.27" />
<PackageReference Include="YamlDotNet" Version="8.0.0" />
<PackageReference Include="Rebus.ServiceProvider" Version="4.0.2" />
<PackageReference Include="YamlDotNet" Version="8.1.0" />
<PackageReference Include="Rebus.ServiceProvider" Version="5.0.6" />
</ItemGroup>
<ItemGroup>

View file

@ -5,6 +5,7 @@ using Elsa.Persistence.Memory;
using Elsa.Services;
using Microsoft.Extensions.DependencyInjection;
using Rebus.Config;
using Rebus.DataBus.InMem;
using Rebus.Persistence.InMem;
using Rebus.Routing.TypeBased;
using Rebus.Transport.InMem;
@ -69,6 +70,7 @@ namespace Elsa
return rebus
.Logging(logging => logging.ColoredConsole())
.Subscriptions(s => s.StoreInMemory(new InMemorySubscriberStore()))
.DataBus(s => s.StoreInMemory(new InMemDataStore()))
.Routing(r => r.TypeBased())
.Transport(t => t.UseInMemoryTransport(new InMemNetwork(), "Messages"));
}

View file

@ -23,7 +23,6 @@ using Elsa.Services;
using Elsa.StartupTasks;
using Elsa.WorkflowProviders;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection.Extensions;
using NodaTime;
using Rebus.Handlers;
@ -162,7 +161,6 @@ namespace Microsoft.Extensions.DependencyInjection
.AddTypeAlias<IActivity>("Activity")
.AddTypeAlias(typeof(IList<>), "List")
.AddTypeAlias(typeof(ICollection<>), "Collection")
.AddTypeAlias<PathString>()
.AddTypeAlias(typeof(LiteralExpression<>), "LiteralExpression");
private static IServiceCollection AddPrimitiveActivities(this IServiceCollection services) =>

View file

@ -10,7 +10,7 @@ namespace Elsa.Messaging.Distributed.Handlers
public RunWorkflowHandler(IWorkflowHost workflowHost) => this.workflowHost = workflowHost;
public Task Handle(RunWorkflow message) => workflowHost.RunWorkflowInstanceAsync(
public async Task Handle(RunWorkflow message) => await workflowHost.RunWorkflowInstanceAsync(
message.InstanceId,
message.ActivityId,
message.Input);

View file

@ -1,6 +1,5 @@
using System;
using System.Linq;
using System.Reflection;
using Elsa.Expressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

View file

@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
</ItemGroup>
</Project>

View file

@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.9.2" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.10.3" />
</ItemGroup>
<ItemGroup>

View file

@ -27,18 +27,18 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.1">
<PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
</ItemGroup>
<ItemGroup>

View file

@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="MongoDb.Bson.NodaTime" Version="2.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.10.1" />
<PackageReference Include="MongoDB.Driver" Version="2.10.3" />
</ItemGroup>
</Project>

View file

@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.3" />
<PackageReference Include="YesSql.Core" Version="2.0.0-beta-1449" />
<PackageReference Include="YesSql.Provider.MySql" Version="1.0.0-beta-1449" />
<PackageReference Include="YesSql.Provider.PostgreSql" Version="1.0.0-beta-1449" />

View file

@ -3,7 +3,18 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<PackageVersion>1.0.0</PackageVersion>
<Authors>Elsa Contributors</Authors>
<Description>
Elsa is a set of workflow libraries and tools that enable super-fast workflowing capabilities in any .NET Core application.
This package provides a GraphQL endpoint to interface with the workflow host.
</Description>
<Copyright>2019</Copyright>
<PackageProjectUrl>https://github.com/elsa-workflows/elsa-core</PackageProjectUrl>
<RepositoryUrl>https://github.com/elsa-workflows/elsa-core</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<PackageTags>elsa, workflows</PackageTags>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
@ -11,9 +22,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HotChocolate.AspNetCore" Version="10.3.5" />
<PackageReference Include="HotChocolate.AspNetCore.Playground" Version="10.3.5" />
<PackageReference Include="HotChocolate.AspNetCore.Voyager" Version="10.3.5" />
<PackageReference Include="HotChocolate.AspNetCore" Version="10.4.1" />
<PackageReference Include="HotChocolate.AspNetCore.Playground" Version="10.4.1" />
<PackageReference Include="HotChocolate.AspNetCore.Voyager" Version="10.4.1" />
</ItemGroup>
<ItemGroup>
<None Include="icon.png">
<Pack>True</Pack>
<PackagePath />
</None>
</ItemGroup>
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -2,6 +2,19 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<PackageVersion>1.0.0</PackageVersion>
<Authors>Elsa Contributors</Authors>
<Description>
Elsa is a set of workflow libraries and tools that enable super-fast workflowing capabilities in any .NET Core application.
This package provides test helpers.
</Description>
<Copyright>2019</Copyright>
<PackageProjectUrl>https://github.com/elsa-workflows/elsa-core</PackageProjectUrl>
<RepositoryUrl>https://github.com/elsa-workflows/elsa-core</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<PackageTags>elsa, workflows</PackageTags>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
@ -9,4 +22,11 @@
<PackageReference Include="NodaTime" Version="3.0.0-beta01" />
</ItemGroup>
<ItemGroup>
<None Include="icon.png">
<Pack>True</Pack>
<PackagePath />
</None>
</ItemGroup>
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -10,12 +10,12 @@
<ItemGroup>
<PackageReference Include="AutoFixture.AutoMoq" Version="4.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NodaTime.Testing" Version="3.0.0-beta01" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="coverlet.collector" Version="1.2.1" />
</ItemGroup>
<ItemGroup>