Skip to content

Commit 19429b8

Browse files
mocsharpmocsharp
committed
Upgrade to .NET 8
Signed-off-by: Victor Chang <vicchang@nvidia.com>
1 parent 84ee385 commit 19429b8

File tree

89 files changed

+2610
-2472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2610
-2472
lines changed

‎src/Common/Configuration/Exceptions/ConfigurationException.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
using System;
18-
using System.Runtime.Serialization;
1918

2019
namespace Monai.Deploy.WorkflowManager.Common.Configuration.Exceptions
2120
{
@@ -36,9 +35,5 @@ public ConfigurationException(string message) : base(message)
3635
public ConfigurationException(string message, Exception innerException) : base(message, innerException)
3736
{
3837
}
39-
40-
protected ConfigurationException(SerializationInfo info, StreamingContext context) : base(info, context)
41-
{
42-
}
4338
}
4439
}

‎src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,33 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
1716
<Project Sdk="Microsoft.NET.Sdk">
18-
1917
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
18+
<TargetFramework>net8.0</TargetFramework>
2119
<RootNamespace>Monai.Deploy.WorkflowManager.Configuration</RootNamespace>
2220
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2321
</PropertyGroup>
24-
2522
<ItemGroup>
2623
<AdditionalFiles Include="..\..\..\stylecop.json" />
2724
</ItemGroup>
28-
2925
<ItemGroup>
3026
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
3127
</ItemGroup>
32-
3328
<ItemGroup>
34-
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
35-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
29+
<PackageReference Include="Monai.Deploy.Messaging" Version="2.0.0" />
30+
<PackageReference Include="Monai.Deploy.Storage" Version="1.0.0" />
3631
</ItemGroup>
37-
3832
<ItemGroup>
3933
<Compile Remove="Test\**" />
4034
<EmbeddedResource Remove="Test\**" />
4135
<None Remove="Test\**" />
4236
</ItemGroup>
43-
4437
<ItemGroup>
4538
<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
4639
</ItemGroup>
47-
4840
<PropertyGroup>
4941
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
5042
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
5143
<CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
5244
</PropertyGroup>
53-
</Project>
45+
</Project>

‎src/Common/Configuration/packages.lock.json‎

Lines changed: 90 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,136 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net6.0": {
4+
"net8.0": {
55
"Monai.Deploy.Messaging": {
66
"type": "Direct",
7-
"requested": "[1.0.6, )",
8-
"resolved": "1.0.6",
9-
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
7+
"requested": "[2.0.0, )",
8+
"resolved": "2.0.0",
9+
"contentHash": "LcerCeHWDSB3Q1Vw0La9pYvXdNNDu4nGUie2bvVlL8lCkxbVNx+rtDorV5cA8KSKW9GZd/RD6SAsIzcjMXqP6Q==",
1010
"dependencies": {
11-
"Ardalis.GuardClauses": "4.1.1",
12-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
11+
"Ardalis.GuardClauses": "4.3.0",
12+
"Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0",
1313
"Newtonsoft.Json": "13.0.3",
14-
"System.IO.Abstractions": "17.2.3"
14+
"System.IO.Abstractions": "20.0.4"
1515
}
1616
},
1717
"Monai.Deploy.Storage": {
1818
"type": "Direct",
19-
"requested": "[0.2.18, )",
20-
"resolved": "0.2.18",
21-
"contentHash": "+1JX7QDgVEMqYA0/M1QMr1gtXRC6lEuhBtLfJXWi6cEgh9kOPE0KiHd1AWI7PxBgBbsEBZaNQSvWqShlwcu6bA==",
19+
"requested": "[1.0.0, )",
20+
"resolved": "1.0.0",
21+
"contentHash": "YN087swDoJJCj+UgPVWzsraxL730ajg8OJdEahgPvZFe4quFlfhWIGLweVKRNhSvrN/CV87/m+noLJu7jSEaww==",
2222
"dependencies": {
23-
"AWSSDK.SecurityToken": "3.7.201.9",
24-
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
25-
"Monai.Deploy.Storage.S3Policy": "0.2.18",
26-
"System.IO.Abstractions": "17.2.3"
23+
"AWSSDK.SecurityToken": "3.7.300.30",
24+
"Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0",
25+
"Monai.Deploy.Storage.S3Policy": "1.0.0",
26+
"System.IO.Abstractions": "20.0.4"
2727
}
2828
},
2929
"Ardalis.GuardClauses": {
3030
"type": "Transitive",
31-
"resolved": "4.1.1",
32-
"contentHash": "+UcJ2s+gf2wMNrwadCaHZV2DMcGgBU1t22A+jm40P4MHQRLy9hcleGy5xdVWd4dXZPa5Vlp4TG5xU2rhoDYrBA=="
31+
"resolved": "4.3.0",
32+
"contentHash": "5KQ6zQDNRduora6L8lGQcRikLNLj0s4XjctGuUX24uBRzHMMKv6BatVDSBWRs96riz7PJj7Efn3yOFhfYXgnWg=="
3333
},
3434
"AWSSDK.Core": {
3535
"type": "Transitive",
36-
"resolved": "3.7.200.13",
37-
"contentHash": "yiUuhTI8w183euRqhXym1DyhnD/1ccxceRoruCfkIoqY3PAaFgFL8pE4iDLDZa7SUW4M4qZnQ5PMlFr1rrl6zw=="
36+
"resolved": "3.7.300.29",
37+
"contentHash": "BMvjbKNzA7Y1eFbhnRbexaUKZ6FwR/hAdvmPYYYA35kw0Ig5E12shMiCEqtRL1EQYVpAqmLdSPZNxV4hu5Ncng=="
3838
},
3939
"AWSSDK.SecurityToken": {
4040
"type": "Transitive",
41-
"resolved": "3.7.201.9",
42-
"contentHash": "yKlTPrvNeDdzkOX82Ydf7MD09Gk3dK74JWZPRWJ3QIxskWVoNTAyLvfVBzbi+/fGnjf8/qKsSzxT7GHLqds37A==",
41+
"resolved": "3.7.300.30",
42+
"contentHash": "hsCHGNTf1UeNEVBrjuFsWQfylcqzrBn27bfidgr0VVCKc82dz/PEFIrSFzXuEOjvRSiO5wji/V7x9bGyf1aJ6A==",
4343
"dependencies": {
44-
"AWSSDK.Core": "[3.7.200.13, 4.0.0)"
44+
"AWSSDK.Core": "[3.7.300.29, 4.0.0)"
4545
}
4646
},
4747
"Microsoft.Extensions.Configuration.Abstractions": {
4848
"type": "Transitive",
49-
"resolved": "6.0.0",
50-
"contentHash": "qWzV9o+ZRWq+pGm+1dF+R7qTgTYoXvbyowRoBxQJGfqTpqDun2eteerjRQhq5PQ/14S+lqto3Ft4gYaRyl4rdQ==",
49+
"resolved": "8.0.0",
50+
"contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
5151
"dependencies": {
52-
"Microsoft.Extensions.Primitives": "6.0.0"
52+
"Microsoft.Extensions.Primitives": "8.0.0"
5353
}
5454
},
5555
"Microsoft.Extensions.DependencyInjection.Abstractions": {
5656
"type": "Transitive",
57-
"resolved": "6.0.0",
58-
"contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg=="
57+
"resolved": "8.0.0",
58+
"contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
59+
},
60+
"Microsoft.Extensions.Diagnostics.Abstractions": {
61+
"type": "Transitive",
62+
"resolved": "8.0.0",
63+
"contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==",
64+
"dependencies": {
65+
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
66+
"Microsoft.Extensions.Options": "8.0.0",
67+
"System.Diagnostics.DiagnosticSource": "8.0.0"
68+
}
5969
},
6070
"Microsoft.Extensions.Diagnostics.HealthChecks": {
6171
"type": "Transitive",
62-
"resolved": "6.0.21",
63-
"contentHash": "1Qf/tEg6IlzbvCxrc+pZE+ZGrajBdB/+V2+abeAu6lg8wXGHmO8JtnrNqwc5svSbcz3udxinUPyH3vw6ZujKbg==",
72+
"resolved": "8.0.0",
73+
"contentHash": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==",
6474
"dependencies": {
65-
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.21",
66-
"Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
67-
"Microsoft.Extensions.Logging.Abstractions": "6.0.4",
68-
"Microsoft.Extensions.Options": "6.0.0"
75+
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0",
76+
"Microsoft.Extensions.Hosting.Abstractions": "8.0.0",
77+
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
78+
"Microsoft.Extensions.Options": "8.0.0"
6979
}
7080
},
7181
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
7282
"type": "Transitive",
73-
"resolved": "6.0.21",
74-
"contentHash": "5FSA1euCRtbRqVgTn2ahgCG9Cy29UQXAZMCJLUlrQQaC5rko0+d/aq9SiFGIDP7cvoWUsatrlNdfc6UyOMV5aA=="
83+
"resolved": "8.0.0",
84+
"contentHash": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg=="
7585
},
7686
"Microsoft.Extensions.FileProviders.Abstractions": {
7787
"type": "Transitive",
78-
"resolved": "6.0.0",
79-
"contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
88+
"resolved": "8.0.0",
89+
"contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==",
8090
"dependencies": {
81-
"Microsoft.Extensions.Primitives": "6.0.0"
91+
"Microsoft.Extensions.Primitives": "8.0.0"
8292
}
8393
},
8494
"Microsoft.Extensions.Hosting.Abstractions": {
8595
"type": "Transitive",
86-
"resolved": "6.0.0",
87-
"contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
96+
"resolved": "8.0.0",
97+
"contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==",
8898
"dependencies": {
89-
"Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
90-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
91-
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
99+
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0",
100+
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
101+
"Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0",
102+
"Microsoft.Extensions.FileProviders.Abstractions": "8.0.0",
103+
"Microsoft.Extensions.Logging.Abstractions": "8.0.0"
92104
}
93105
},
94106
"Microsoft.Extensions.Logging.Abstractions": {
95107
"type": "Transitive",
96-
"resolved": "6.0.4",
97-
"contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
108+
"resolved": "8.0.0",
109+
"contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==",
110+
"dependencies": {
111+
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
112+
}
98113
},
99114
"Microsoft.Extensions.Options": {
100115
"type": "Transitive",
101-
"resolved": "6.0.0",
102-
"contentHash": "dzXN0+V1AyjOe2xcJ86Qbo233KHuLEY0njf/P2Kw8SfJU+d45HNS2ctJdnEnrWbM9Ye2eFgaC5Mj9otRMU6IsQ==",
116+
"resolved": "8.0.0",
117+
"contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==",
103118
"dependencies": {
104-
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
105-
"Microsoft.Extensions.Primitives": "6.0.0"
119+
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
120+
"Microsoft.Extensions.Primitives": "8.0.0"
106121
}
107122
},
108123
"Microsoft.Extensions.Primitives": {
109124
"type": "Transitive",
110-
"resolved": "6.0.0",
111-
"contentHash": "9+PnzmQFfEFNR9J2aDTfJGGupShHjOuGw4VUv+JB044biSHrnmCIMD+mJHmb2H7YryrfBEXDurxQ47gJZdCKNQ==",
112-
"dependencies": {
113-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
114-
}
125+
"resolved": "8.0.0",
126+
"contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
115127
},
116128
"Monai.Deploy.Storage.S3Policy": {
117129
"type": "Transitive",
118-
"resolved": "0.2.18",
119-
"contentHash": "+b0nDnf4OoajdH2hB02elRC6G+GjlYnxJC+F3dGbUUXGMtPApzs8c8s/EG4fKzihxsVovJtqnJl7atcaPyl12Q==",
130+
"resolved": "1.0.0",
131+
"contentHash": "I8My4nZEt1vA2wDvti84CfhK+TnyW60E/50Cb+xyhzdrlqWpWr/Xbwhl1ocELAPDeRsakECK4cikrNYLbpp+pQ==",
120132
"dependencies": {
121-
"Ardalis.GuardClauses": "4.1.1",
133+
"Ardalis.GuardClauses": "4.3.0",
122134
"Newtonsoft.Json": "13.0.3"
123135
}
124136
},
@@ -127,15 +139,32 @@
127139
"resolved": "13.0.3",
128140
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
129141
},
142+
"System.Diagnostics.DiagnosticSource": {
143+
"type": "Transitive",
144+
"resolved": "8.0.0",
145+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
146+
},
130147
"System.IO.Abstractions": {
131148
"type": "Transitive",
132-
"resolved": "17.2.3",
133-
"contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
149+
"resolved": "20.0.4",
150+
"contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==",
151+
"dependencies": {
152+
"TestableIO.System.IO.Abstractions": "20.0.4",
153+
"TestableIO.System.IO.Abstractions.Wrappers": "20.0.4"
154+
}
155+
},
156+
"TestableIO.System.IO.Abstractions": {
157+
"type": "Transitive",
158+
"resolved": "20.0.4",
159+
"contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA=="
134160
},
135-
"System.Runtime.CompilerServices.Unsafe": {
161+
"TestableIO.System.IO.Abstractions.Wrappers": {
136162
"type": "Transitive",
137-
"resolved": "6.0.0",
138-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
163+
"resolved": "20.0.4",
164+
"contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==",
165+
"dependencies": {
166+
"TestableIO.System.IO.Abstractions": "20.0.4"
167+
}
139168
}
140169
}
141170
}

‎src/Common/Miscellaneous/LoggingDataDictionary.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
using System.Globalization;
19-
using System.Runtime.Serialization;
2019

2120
namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
2221
{
@@ -27,10 +26,6 @@ public LoggingDataDictionary()
2726
{
2827
}
2928

30-
protected LoggingDataDictionary(SerializationInfo info, StreamingContext context) : base(info, context)
31-
{
32-
}
33-
3429
public override string ToString()
3530
{
3631
var pairs = this.Select(x => string.Format(CultureInfo.InvariantCulture, "{0}={1}", x.Key, x.Value));

‎src/Common/Miscellaneous/Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,40 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
1716
<Project Sdk="Microsoft.NET.Sdk">
18-
1917
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
18+
<TargetFramework>net8.0</TargetFramework>
2119
<RootNamespace>Monai.Deploy.WorkflowManager.Common</RootNamespace>
2220
<ImplicitUsings>enable</ImplicitUsings>
2321
<Nullable>enable</Nullable>
2422
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2523
</PropertyGroup>
26-
2724
<ItemGroup>
2825
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2926
</ItemGroup>
30-
3127
<ItemGroup>
3228
<AdditionalFiles Include="..\..\..\stylecop.json" />
3329
</ItemGroup>
34-
3530
<ItemGroup>
3631
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
3732
</ItemGroup>
38-
3933
<ItemGroup>
4034
<Compile Remove="Test\**" />
4135
<EmbeddedResource Remove="Test\**" />
4236
<None Remove="Test\**" />
4337
</ItemGroup>
44-
4538
<ItemGroup>
4639
<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
4740
</ItemGroup>
48-
4941
<ItemGroup>
50-
<PackageReference Include="fo-dicom" Version="5.1.1" />
42+
<PackageReference Include="fo-dicom" Version="5.1.2" />
5143
</ItemGroup>
52-
5344
<ItemGroup>
5445
<ProjectReference Include="..\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
5546
</ItemGroup>
56-
5747
<PropertyGroup>
5848
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
5949
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
6050
<CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
6151
</PropertyGroup>
62-
</Project>
52+
</Project>

0 commit comments

Comments
 (0)