Skip to content

Commit 2869b7f

Browse files
mocsharpmocsharp
committed
Update NLog
Signed-off-by: Victor Chang <[email protected]>
1 parent b64b619 commit 2869b7f

File tree

9 files changed

+54
-61
lines changed

9 files changed

+54
-61
lines changed

‎doc/dependency_decisions.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -809,22 +809,21 @@
809809
- :who: mocsharp
810810
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE)
811811
:versions:
812-
- 0.2.15
812+
- 0.2.16
813813
:when: 2022-08-16 23:06:21.988183476 Z
814814
- - :approve
815815
- Monai.Deploy.Storage.MinIO
816816
- :who: mocsharp
817817
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE)
818818
:versions:
819-
- 0.2.15
819+
- 0.2.16
820820
:when: 2022-08-16 23:06:22.426838304 Z
821821
- - :approve
822822
- Monai.Deploy.Storage.S3Policy
823823
- :who: mocsharp
824824
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-storage/raw/main/LICENSE)
825825
:versions:
826-
- 0.2.13
827-
- 0.2.15
826+
- 0.2.16
828827
:when: 2022-08-16 23:06:22.881956546 Z
829828
- - :approve
830829
- Monai.Deploy.Security
@@ -2345,21 +2344,21 @@
23452344
- :who: mocsharp
23462345
:why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt)
23472346
:versions:
2348-
- 5.1.2
2347+
- 5.1.3
23492348
:when: 2022-10-12 03:14:06.538744982 Z
23502349
- - :approve
23512350
- NLog.Extensions.Logging
23522351
- :who: mocsharp
23532352
:why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE)
23542353
:versions:
2355-
- 5.2.2
2354+
- 5.2.3
23562355
:when: 2022-10-12 03:14:06.964203977 Z
23572356
- - :approve
23582357
- NLog.Web.AspNetCore
23592358
- :who: mocsharp
23602359
:why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE)
23612360
:versions:
2362-
- 5.2.2
2361+
- 5.2.3
23632362
:when: 2022-10-12 03:14:07.396706995 Z
23642363
- - :approve
23652364
- fo-dicom.NLog

‎src/Client/Test/packages.lock.json

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -846,25 +846,25 @@
846846
},
847847
"NLog": {
848848
"type": "Transitive",
849-
"resolved": "5.1.2",
850-
"contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ=="
849+
"resolved": "5.1.3",
850+
"contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ=="
851851
},
852852
"NLog.Extensions.Logging": {
853853
"type": "Transitive",
854-
"resolved": "5.2.2",
855-
"contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==",
854+
"resolved": "5.2.3",
855+
"contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==",
856856
"dependencies": {
857857
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
858858
"Microsoft.Extensions.Logging": "6.0.0",
859-
"NLog": "5.1.2"
859+
"NLog": "5.1.3"
860860
}
861861
},
862862
"NLog.Web.AspNetCore": {
863863
"type": "Transitive",
864-
"resolved": "5.2.2",
865-
"contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==",
864+
"resolved": "5.2.3",
865+
"contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==",
866866
"dependencies": {
867-
"NLog.Extensions.Logging": "5.2.2"
867+
"NLog.Extensions.Logging": "5.2.3"
868868
}
869869
},
870870
"NuGet.Frameworks": {
@@ -1616,11 +1616,6 @@
16161616
"resolved": "4.4.0",
16171617
"contentHash": "BahUww/+mdP4ARCAh2RQhQTg13wYLVrBb9SYVgW8ZlrwjraGCXHGjo0oIiUfZ34LUZkMMR+RAzR7dEY4S1HeQQ=="
16181618
},
1619-
"TestableIO.System.IO.Abstractions": {
1620-
"type": "Transitive",
1621-
"resolved": "18.0.1",
1622-
"contentHash": "nacJfL4mGObg8Ttn3ZCJZ2u9z8ivG43xgUJvQQLKCmDnle4m49NYNOLk8cqB4iPdSqVhnUSy+qcIryWgDHCqeg=="
1623-
},
16241619
"xunit.abstractions": {
16251620
"type": "Transitive",
16261621
"resolved": "2.0.3",
@@ -1696,8 +1691,8 @@
16961691
"Monai.Deploy.Security": "[0.1.3, )",
16971692
"Monai.Deploy.Storage": "[0.2.16, )",
16981693
"Monai.Deploy.Storage.MinIO": "[0.2.16, )",
1699-
"NLog": "[5.1.2, )",
1700-
"NLog.Web.AspNetCore": "[5.2.2, )",
1694+
"NLog": "[5.1.3, )",
1695+
"NLog.Web.AspNetCore": "[5.2.3, )",
17011696
"Polly": "[7.2.3, )",
17021697
"Swashbuckle.AspNetCore": "[6.5.0, )",
17031698
"fo-dicom": "[5.0.3, )",

‎src/DicomWebClient/API/DicomWebClientException.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 MONAI Consortium
2+
* Copyright 2021-2023 MONAI Consortium
33
* Copyright 2019-2020 NVIDIA Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
4444
{
4545
if (info == null)
4646
{
47-
throw new ArgumentNullException("info");
47+
throw new ArgumentNullException(nameof(info));
4848
}
4949

5050
info.AddValue(nameof(StatusCode), StatusCode, typeof(HttpStatusCode?));

‎src/DicomWebClient/Common/HttpResponseMessageExtension.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 MONAI Consortium
2+
* Copyright 2021-2023 MONAI Consortium
33
* Copyright 2019-2020 NVIDIA Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,7 @@ public static async IAsyncEnumerable<DicomFile> ToDicomAsyncEnumerable(this Http
5151
{
5252
using (var memoryStream = new MemoryStream(buffer))
5353
{
54-
yield return await DicomFile.OpenAsync(memoryStream, FileReadOption.ReadAll);
54+
yield return await DicomFile.OpenAsync(memoryStream, FileReadOption.ReadAll).ConfigureAwait(false);
5555
}
5656
}
5757
}
@@ -63,7 +63,7 @@ public static async Task<byte[]> ToBinaryData(this HttpResponseMessage response)
6363
{
6464
await foreach (var buffer in DecodeMultipartMessage(response))
6565
{
66-
await memoryStream.WriteAsync(buffer, 0, buffer.Length);
66+
await memoryStream.WriteAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
6767
}
6868
return memoryStream.ToArray();
6969
}

‎src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<PackageReference Include="Monai.Deploy.Security" Version="0.1.3" />
5454
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.16" />
5555
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.16" />
56-
<PackageReference Include="NLog.Web.AspNetCore" Version="5.2.2" />
57-
<PackageReference Include="NLog" Version="5.1.2" />
56+
<PackageReference Include="NLog.Web.AspNetCore" Version="5.2.3" />
57+
<PackageReference Include="NLog" Version="5.1.3" />
5858
<PackageReference Include="Polly" Version="7.2.3" />
5959
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
6060
</ItemGroup>

‎src/InformaticsGateway/Services/Http/Startup.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 MONAI Consortium
2+
* Copyright 2021-2023 MONAI Consortium
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
3030
using Microsoft.OpenApi.Models;
3131
using Monai.Deploy.InformaticsGateway.Api.Rest;
3232
using Monai.Deploy.InformaticsGateway.Database;
33-
using Monai.Deploy.InformaticsGateway.Database.EntityFramework;
3433
using Monai.Deploy.InformaticsGateway.Services.Fhir;
3534
using Monai.Deploy.Security.Authentication.Extensions;
3635

‎src/InformaticsGateway/Test/packages.lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,25 +1085,25 @@
10851085
},
10861086
"NLog": {
10871087
"type": "Transitive",
1088-
"resolved": "5.1.2",
1089-
"contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ=="
1088+
"resolved": "5.1.3",
1089+
"contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ=="
10901090
},
10911091
"NLog.Extensions.Logging": {
10921092
"type": "Transitive",
1093-
"resolved": "5.2.2",
1094-
"contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==",
1093+
"resolved": "5.2.3",
1094+
"contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==",
10951095
"dependencies": {
10961096
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
10971097
"Microsoft.Extensions.Logging": "6.0.0",
1098-
"NLog": "5.1.2"
1098+
"NLog": "5.1.3"
10991099
}
11001100
},
11011101
"NLog.Web.AspNetCore": {
11021102
"type": "Transitive",
1103-
"resolved": "5.2.2",
1104-
"contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==",
1103+
"resolved": "5.2.3",
1104+
"contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==",
11051105
"dependencies": {
1106-
"NLog.Extensions.Logging": "5.2.2"
1106+
"NLog.Extensions.Logging": "5.2.3"
11071107
}
11081108
},
11091109
"NuGet.Frameworks": {
@@ -1919,8 +1919,8 @@
19191919
"Monai.Deploy.Security": "[0.1.3, )",
19201920
"Monai.Deploy.Storage": "[0.2.16, )",
19211921
"Monai.Deploy.Storage.MinIO": "[0.2.16, )",
1922-
"NLog": "[5.1.2, )",
1923-
"NLog.Web.AspNetCore": "[5.2.2, )",
1922+
"NLog": "[5.1.3, )",
1923+
"NLog.Web.AspNetCore": "[5.2.3, )",
19241924
"Polly": "[7.2.3, )",
19251925
"Swashbuckle.AspNetCore": "[6.5.0, )",
19261926
"fo-dicom": "[5.0.3, )",

‎src/InformaticsGateway/packages.lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,17 @@
229229
},
230230
"NLog": {
231231
"type": "Direct",
232-
"requested": "[5.1.2, )",
233-
"resolved": "5.1.2",
234-
"contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ=="
232+
"requested": "[5.1.3, )",
233+
"resolved": "5.1.3",
234+
"contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ=="
235235
},
236236
"NLog.Web.AspNetCore": {
237237
"type": "Direct",
238-
"requested": "[5.2.2, )",
239-
"resolved": "5.2.2",
240-
"contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==",
238+
"requested": "[5.2.3, )",
239+
"resolved": "5.2.3",
240+
"contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==",
241241
"dependencies": {
242-
"NLog.Extensions.Logging": "5.2.2"
242+
"NLog.Extensions.Logging": "5.2.3"
243243
}
244244
},
245245
"Polly": {
@@ -824,12 +824,12 @@
824824
},
825825
"NLog.Extensions.Logging": {
826826
"type": "Transitive",
827-
"resolved": "5.2.2",
828-
"contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==",
827+
"resolved": "5.2.3",
828+
"contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==",
829829
"dependencies": {
830830
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
831831
"Microsoft.Extensions.Logging": "6.0.0",
832-
"NLog": "5.1.2"
832+
"NLog": "5.1.3"
833833
}
834834
},
835835
"RabbitMQ.Client": {

‎tests/Integration.Test/packages.lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -918,25 +918,25 @@
918918
},
919919
"NLog": {
920920
"type": "Transitive",
921-
"resolved": "5.1.2",
922-
"contentHash": "JfQY93ure3IPVTN3eabBewBGvrcXcWIlaesFEXdy5UzIymfIT9yCgLISYtM0cOhjWziIaUr/6Z9NC2RwtjwrsQ=="
921+
"resolved": "5.1.3",
922+
"contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ=="
923923
},
924924
"NLog.Extensions.Logging": {
925925
"type": "Transitive",
926-
"resolved": "5.2.2",
927-
"contentHash": "V6sd+0Hrk2XlU//XbUizFYTE8Hf8+xFkhi81shIhsKl4tvWFUYmjBY/zBy/wlQCt0K6mfseaEKnayRJVhIz5Iw==",
926+
"resolved": "5.2.3",
927+
"contentHash": "TB8zPGV2nVpvWq5C8zIVHPSmnzOHMrXppjsAwHcuJq1Ehs8sC0llnAv5Ysf5Lf/vew9amV/+01MohtRFSDzKdQ==",
928928
"dependencies": {
929929
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
930930
"Microsoft.Extensions.Logging": "6.0.0",
931-
"NLog": "5.1.2"
931+
"NLog": "5.1.3"
932932
}
933933
},
934934
"NLog.Web.AspNetCore": {
935935
"type": "Transitive",
936-
"resolved": "5.2.2",
937-
"contentHash": "0Qa6V7LXgbWNxYdZDLcQz/TjGrSfx32XThxAL+xoAtjplC2uCIhy27WiMIjznuMAJR3zjElIiYzMmPSsQ4LZSQ==",
936+
"resolved": "5.2.3",
937+
"contentHash": "uP0KekbkswuMjo1dbaqu20TxH2Dc3ox2qJDIi837ob2Fq/BliZHuQY9nJdM3UArVrLrsl+xxsx0D6h8m3fOufg==",
938938
"dependencies": {
939-
"NLog.Extensions.Logging": "5.2.2"
939+
"NLog.Extensions.Logging": "5.2.3"
940940
}
941941
},
942942
"NuGet.Frameworks": {
@@ -1814,8 +1814,8 @@
18141814
"Monai.Deploy.Security": "[0.1.3, )",
18151815
"Monai.Deploy.Storage": "[0.2.16, )",
18161816
"Monai.Deploy.Storage.MinIO": "[0.2.16, )",
1817-
"NLog": "[5.1.2, )",
1818-
"NLog.Web.AspNetCore": "[5.2.2, )",
1817+
"NLog": "[5.1.3, )",
1818+
"NLog.Web.AspNetCore": "[5.2.3, )",
18191819
"Polly": "[7.2.3, )",
18201820
"Swashbuckle.AspNetCore": "[6.5.0, )",
18211821
"fo-dicom": "[5.0.3, )",

0 commit comments

Comments
 (0)