Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions examples/ConductorSharp.ApiEnabled/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ WORKDIR /app
EXPOSE 80

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

ENV HUSKY 0

WORKDIR /src
COPY ["examples/ConductorSharp.ApiEnabled/ConductorSharp.ApiEnabled.csproj", "examples/ConductorSharp.ApiEnabled/"]
COPY ["src/ConductorSharp.Engine/ConductorSharp.Engine.csproj", "src/ConductorSharp.Engine/"]
Expand Down
3 changes: 3 additions & 0 deletions examples/ConductorSharp.Definitions/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

ENV HUSKY 0

WORKDIR /src
COPY ["examples/ConductorSharp.Definitions/ConductorSharp.Definitions.csproj", "examples/ConductorSharp.Definitions/"]
COPY ["src/ConductorSharp.Engine/ConductorSharp.Engine.csproj", "src/ConductorSharp.Engine/"]
Expand Down
3 changes: 3 additions & 0 deletions examples/ConductorSharp.NoApi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

ENV HUSKY 0

WORKDIR /src
COPY ["examples/ConductorSharp.NoApi/ConductorSharp.NoApi.csproj", "examples/ConductorSharp.NoApi/"]
COPY ["src/ConductorSharp.Engine/ConductorSharp.Engine.csproj", "src/ConductorSharp.Engine/"]
Expand Down
2 changes: 0 additions & 2 deletions src/ConductorSharp.Client/ConductorSharp.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RestSharp" Version="107.3.0" />
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="107.3.0" />
Expand Down
8 changes: 1 addition & 7 deletions src/ConductorSharp.Client/Service/MetadataService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ConductorSharp.Client.Model.Common;
using ConductorSharp.Client.Util;
using Microsoft.Extensions.Options;
using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
Expand All @@ -9,14 +8,9 @@ namespace ConductorSharp.Client.Service
{
public class MetadataService : IMetadataService
{
private readonly RestConfig _restConfig;
private readonly IConductorClient _conductorClient;

public MetadataService(IConductorClient client, IOptions<RestConfig> restConfig)
{
_restConfig = restConfig.Value;
_conductorClient = client;
}
public MetadataService(IConductorClient client) => _conductorClient = client;

public async Task<TaskDefinition[]> GetAllTaskDefinitions() =>
(await _conductorClient.ExecuteRequestAsync<TaskDefinition[]>(ApiUrls.GetAllTaskDefinitions(), HttpMethod.Get));
Expand Down
1 change: 0 additions & 1 deletion src/ConductorSharp.Engine/ConductorSharp.Engine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

Expand Down