Upgrade fo-dicom to 5.0.1

Author: mocsharp

README.md

@@ -21,6 +21,10 @@ First, export the following environment variable before executing `dotnet run`:
 export DOTNET_ENVIRONMENT=Development
 ```
 
+```powershell
+$env:DOTNET_ENVIRONMENT="Development"
+```
+
 ### Building MONAI Deploy Informatics Gateway
 
 ```bash

build.sh

@@ -29,5 +29,5 @@ pushd $SCRIPT_DIR/src/CLI
 # echo "Building Informatics Gateway CLI: win-x64"
 # dotnet publish -r win-x64 -c Release -o $SCRIPT_DIR/cli/win-x64
 echo "Building Informatics Gateway CLI: linux-x64"
-dotnet publish -r linux-x64 -c Release -o $SCRIPT_DIR/cli/linux-x64
+dotnet publish --self-contained -r linux-x64 -c Release -o $SCRIPT_DIR/cli/linux-x64
 popd

src/Api/IsExternalinit.cs

@@ -1,6 +1,18 @@
-namespace System.Runtime.CompilerServices
+// Copyright 2021 MONAI Consortium
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace System.Runtime.CompilerServices
 {
  using System.ComponentModel;
+
  /// <summary>
  /// Reserved to be used by the compiler for tracking metadata.
  /// This class should not be used by developers in source code.
@@ -9,4 +21,4 @@
  internal static class IsExternalInit
  {
  }
-}
+}

src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

@@ -12,9 +12,10 @@
 
  <PropertyGroup>
  <RootNamespace>Monai.Deploy.InformaticsGateway.Api</RootNamespace>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>netstandard2.1</TargetFramework>
  <LangVersion>9.0</LangVersion>
  <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+ <IsTrimmable>true</IsTrimmable>
  </PropertyGroup>
 
  <ItemGroup>

src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj

@@ -15,7 +15,7 @@
  <TargetFramework>net6.0</TargetFramework>
  <PublishSingleFile>true</PublishSingleFile>
  <SelfContained>true</SelfContained>
- <PublishTrimmed>true</PublishTrimmed>
+ <PublishTrimmed>false</PublishTrimmed>
  <PublishReadyToRun>true</PublishReadyToRun>
  <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
  <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>

src/CLI/Options/Common.cs

@@ -24,6 +24,6 @@ public class Common
  public static readonly string MountedConfigFilePath = Path.Combine(ContainerApplicationRootPath, "appsettings.json");
  public static readonly string MountedDatabasePath = "/database";
  public static readonly string ConfigFilePath = Path.Combine(MigDirectory, "appsettings.json");
- public static readonly string AppSettingsResourceName = $"{Assembly.GetEntryAssembly().GetTypes().First().Namespace}.Resources.appsettings.json";
+ public static readonly string AppSettingsResourceName = $"{typeof(Program).Namespace}.Resources.appsettings.json";
  }
 }

src/CLI/Program.cs

@@ -21,13 +21,12 @@
 using System.CommandLine.Hosting;
 using System.CommandLine.Parsing;
 using System.CommandLine.Rendering;
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using System.Threading.Tasks;
 
 namespace Monai.Deploy.InformaticsGateway.CLI
 {
- partial class Program
+ internal partial class Program
  {
  private static async Task<int> Main(string[] args)
  {

src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj

@@ -12,9 +12,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>netstandard2.1</TargetFramework>
  <RootNamespace>Monai.Deploy.InformaticsGateway.Client.Common</RootNamespace>
-<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+ <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+ <IsTrimmable>true</IsTrimmable>
  </PropertyGroup>
 
  <ItemGroup>
@@ -28,4 +29,4 @@
  <None Remove="Test\**" />
  </ItemGroup>
 
-</Project>
+</Project>

src/Client/Monai.Deploy.InformaticsGateway.Client.csproj

@@ -11,9 +11,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFramework>netstandard2.1</TargetFramework>
  <RootNamespace>Monai.Deploy.InformaticsGateway.Client</RootNamespace>
-<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+ <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+ <IsTrimmable>true</IsTrimmable>
  </PropertyGroup>
 
  <ItemGroup>
@@ -34,4 +35,4 @@
  <ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
  <ProjectReference Include="..\Client.Common\Monai.Deploy.InformaticsGateway.Client.Common.csproj" />
  </ItemGroup>
-</Project>
+</Project>

src/Client/Test/ServiceTestBase.cs

@@ -22,7 +22,7 @@ public class ServiceTestBase
  {
  protected static HttpClient SetupHttpClientMock(string baseUrl, string expectedUrl, HttpMethod httpMethod, HttpResponseMessage httpResponse)
  {
- expectedUrl = Uri.EscapeUriString(expectedUrl);
+ expectedUrl = Uri.EscapeDataString(expectedUrl);
  var mockHandler = new Mock<HttpMessageHandler>();
  mockHandler.Protected()
  .Setup<Task<HttpResponseMessage>>("SendAsync",