Skip to content

Commit

Permalink
Moved Examples into csharp-examples project
Browse files Browse the repository at this point in the history
jmigueprieto committed Dec 4, 2024
1 parent dcebe39 commit ac3bf26
Showing 27 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Conductor/conductor-csharp.csproj
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="110.2.0" />
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="110.2.0" />
<None Include="/package/Conductor/README.md" Pack="true" PackagePath="/" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion Tests/conductor-csharp.test.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
@@ -9,6 +9,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../Conductor/conductor-csharp.csproj" />
<ProjectReference Include="../csharp-examples/csharp-examples.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="TestData\integration_data.json">
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -60,13 +60,13 @@ public void AuditLog(object workflowInput, string status, string name)
}

[WorkerTask(taskType: "simple_task_1", batchSize: 5, pollIntervalMs: 200, workerId: "workerId")]
public static string SimpleTask1(Task task)
public static string SimpleTask1(Conductor.Client.Models.Task task)
{
return "OK";
}

[WorkerTask(taskType: "simple_task_2", batchSize: 5, pollIntervalMs: 200, workerId: "workerId")]
public static TaskResult SimpleTask2(Task task)
public static TaskResult SimpleTask2(Conductor.Client.Models.Task task)
{
return new TaskResult { Status = TaskResult.StatusEnum.FAILEDWITHTERMINALERROR };
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion csharp-examples/csharp-examples.csproj
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Conductor\conductor-csharp.csproj" />
<ProjectReference Include="../Conductor/conductor-csharp.csproj" />
</ItemGroup>

</Project>

0 comments on commit ac3bf26

Please sign in to comment.