Skip to content

Commit a3a2018

Browse files
committed
version conflicts
1 parent 1675ba7 commit a3a2018

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/extensions/WorkflowCore.WebAPI/WorkflowCore.WebAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.3" />
3030
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
3232
</ItemGroup>
3333

3434
</Project>

src/samples/WorkflowCore.Sample13/Program.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
using Microsoft.Extensions.DependencyInjection;
33
using Microsoft.Extensions.Logging;
44
using WorkflowCore.Interface;
5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
using System.Security.Cryptography;
8+
using System.Collections.Generic;
59

610
namespace WorkflowCore.Sample13
711
{
@@ -17,8 +21,8 @@ public static void Main(string[] args)
1721
host.Start();
1822

1923
Console.WriteLine("Starting workflow...");
20-
host.StartWorkflow("parallel-sample");
21-
24+
host.StartWorkflow("parallel-sample");
25+
2226
Console.ReadLine();
2327
host.Stop();
2428
}
@@ -29,7 +33,7 @@ private static IServiceProvider ConfigureServices()
2933
IServiceCollection services = new ServiceCollection();
3034
services.AddLogging();
3135
services.AddWorkflow();
32-
//services.AddWorkflow(x => x.UseMongoDB(@"mongodb://localhost:27017", "workflow-test002"));
36+
//services.AddWorkflow(x => x.UseMongoDB(@"mongodb://localhost:27017", "workflow-test009"));
3337
//services.AddWorkflow(x => x.UseSqlServer(@"Server=.\SQLEXPRESS;Database=WorkflowCoreTest007;Trusted_Connection=True;", true, true));
3438
//services.AddWorkflow(x => x.UseSqlite(@"Data Source=wfc001.db;", true));
3539

test/WorkflowCore.IntegrationTests/WorkflowCore.IntegrationTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="FluentAssertions" Version="4.19.2" />
2424
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
2525
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
26-
<PackageReference Include="Moq" Version="4.7.1" />
26+
<PackageReference Include="Moq" Version="4.7.99" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
2828
<PackageReference Include="xunit" Version="2.2.0" />
2929
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />

test/WorkflowCore.TestAssets/WorkflowCore.TestAssets.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard1.6</TargetFramework>
55
<AssemblyName>WorkflowCore.TestAssets</AssemblyName>
66
<PackageId>WorkflowCore.TestAssets</PackageId>
7-
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
7+
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
88
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1010
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="FluentAssertions" Version="4.19.0" />
20-
<PackageReference Include="Moq" Version="4.7.1" />
20+
<PackageReference Include="Moq" Version="4.7.99" />
2121
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
2222
<PackageReference Include="NUnit" Version="3.6.1" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)