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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ WORKDIR /app
COPY . ./

RUN echo "Building MONAI Workflow Manager $Version ($FileVersion)..."
RUN dotnet publish -c Release -o out --nologo /p:Version=$Version /p:FileVersion=$FileVersion src/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
RUN dotnet publish -c Release -o out --nologo /p:Version=$Version /p:FileVersion=$FileVersion src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj

RUN echo "Fetching mc executable for minio..."
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc
Expand Down
5 changes: 0 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,3 @@ echo "Building Workflow Manager Docker Image. VERSION=$VERSION, FILEVERSION=$FIL
pushd $SCRIPT_DIR
docker build --tag monai/workflow-manager:$VERSION --build-arg Version=$VERSION --build-arg FileVersion=$FILEVERSION .
popd

pushd $SCRIPT_DIR/src/CLI
echo "Building Workflow Manager CLI: linux-x64"
dotnet publish -r linux-x64 -c Release --self-contained -o $SCRIPT_DIR/cli/linux-x64
popd
44 changes: 0 additions & 44 deletions src/CLI/Monai.Deploy.WorkflowManager.CLI.csproj

This file was deleted.

174 changes: 84 additions & 90 deletions src/Monai.Deploy.WorkflowManager.sln

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
using Karambolo.Extensions.Logging.File;
using Microsoft.Extensions.Logging;

namespace Monai.Deploy.WorkflowManager.Logging
namespace Monai.Deploy.WorkflowManager.Configuration.Logging
{
public class FileLoggingTextFormatter : FileLogEntryTextBuilder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
~ Copyright 2022 MONAI Consortium
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -23,13 +23,15 @@
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
<AdditionalFiles Include="..\..\stylecop.json" />
<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
<AdditionalFiles Include="..\..\..\stylecop.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
Expand All @@ -43,7 +45,7 @@
</ItemGroup>

<ItemGroup>
<AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
</ItemGroup>

<PropertyGroup>
Expand Down
Loading