Skip to content

Commit 9549e67

Browse files
author
Chris Maunder
committed
Bumped .NET dependencies t0 9.0
1 parent d437411 commit 9549e67

File tree

10 files changed

+45
-43
lines changed

10 files changed

+45
-43
lines changed

‎modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,16 @@
8686
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='CPU'" />
8787
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.19.2" Condition="'$(GpuType)'=='CUDA'" />
8888
<PackageReference Include="Microsoft.ML.OnnxRuntime.OpenVino" Version="1.13.1-dev-20221026-1209-861125ccb" Condition="'$(GpuType)'=='OpenVINO'" />
89-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.19.2" Condition="'$(GpuType)'=='DirectML'" />
89+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.20.1" Condition="'$(GpuType)'=='DirectML'" />
9090
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='MPS'" />
9191

9292
<!-- https://github.com/microsoft/onnxruntime/issues/12677#issuecomment-1443802719 -->
93-
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.2" Condition="'$(GpuType)'=='DirectML'" />
93+
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.4" Condition="'$(GpuType)'=='DirectML'" />
9494

9595
<PackageReference Include="SkiaSharp" Version="2.88.8" />
96-
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
97-
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
96+
97+
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
98+
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
9899
</ItemGroup>
99100

100101
<!-- Output the settings based on what we've determined above -->

‎modules/ObjectDetectionYOLOv5Net/modulesettings.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"ObjectDetectionYOLOv5Net": {
55
"Name": "Object Detection (YOLOv5 .NET)",
6-
"Version": "1.13.0",
6+
"Version": "1.14.0",
77

88
"PublishingInfo" : {
99
"Description": "Provides Object Detection using YOLOv5 ONNX models with DirectML. This module is best for those on Windows and Linux without CUDA enabled GPUs",
@@ -71,7 +71,8 @@
7171
{ "ModuleVersion": "1.10.2", "ServerVersionRange": [ "2.6.5", "2.7.0" ], "ReleaseDate": "2024-02-26", "ReleaseNotes": "Corrections for backwards compatibility for 2.6.5" },
7272
{ "ModuleVersion": "1.11.0", "ServerVersionRange": [ "2.8.0", "2.9.0" ], "ReleaseDate": "2024-08-02", "ReleaseNotes": "Updated for server 2.8" },
7373
{ "ModuleVersion": "1.12.0", "ServerVersionRange": [ "2.9.1", "2.9.1" ], "ReleaseDate": "2024-11-17", "ReleaseNotes": "Updated to .NET 9" },
74-
{ "ModuleVersion": "1.13.0", "ServerVersionRange": [ "2.9.2", "" ], "ReleaseDate": "2024-11-24", "ReleaseNotes": "Updated to reflect updated CodeProject.AI SDK" }
74+
{ "ModuleVersion": "1.13.0", "ServerVersionRange": [ "2.9.2", "2.9.3" ], "ReleaseDate": "2024-11-24", "ReleaseNotes": "Updated to reflect updated CodeProject.AI SDK" },
75+
{ "ModuleVersion": "1.14.0", "ServerVersionRange": [ "2.9.4", "" ], "ReleaseDate": "2024-12-03", "ReleaseNotes": "Bumped .NET dependencies to 9.0" }
7576
]
7677
},
7778

‎src/SDK/NET/NET.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
</PropertyGroup>
3535

3636
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
37-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
38-
<PackageReference Include="System.Text.Json" Version="8.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
37+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
38+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
4444
</ItemGroup>
4545

4646
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- Everything else -->
47-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
48-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
49-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
50-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
51-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
52-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
53-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
47+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
48+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
49+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
50+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
51+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
5454
</ItemGroup>
5555

5656
<ItemGroup>
@@ -59,7 +59,7 @@
5959
<PackageReference Include="SkiaSharp" Version="2.88.8" />
6060
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
6161
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
62-
<PackageReference Include="System.Management" Version="8.0.0" />
62+
<PackageReference Include="System.Management" Version="9.0.0" />
6363
</ItemGroup>
6464

6565
<ItemGroup>

‎src/demos/clients/Net/JsonAPI/JsonAPI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="../../../SDK/NET/Common.targets" />
3+
<Import Project="../../../../SDK/NET/Common.targets" />
44

55
<PropertyGroup>
66
<TargetFramework>net9.0</TargetFramework>

‎src/demos/modules/DotNetLongProcess/DotNetLongProcess.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
</PropertyGroup>
5858

5959
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
60-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
60+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
6161
</ItemGroup>
6262

6363
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- NOT Mac Apple Silicon -->
64-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
64+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
6565
</ItemGroup>
6666

6767
<ItemGroup>

‎src/demos/modules/DotNetSimple/DotNetSimple.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<PackageReference Include="CodeProject.AI.Module.SDK" Version="1.1.0" />
5252

5353
<PackageReference Include="Yolov8.Net" Version="2.0.0" />
54-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
54+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
5555
<PackageReference Include="SkiaSharp" Version="2.88.8" />
5656

5757
<!-- Hardware Specific packages. Note that for CUDA, even if there may not be any actual
@@ -60,18 +60,18 @@
6060
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='CPU'" />
6161
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.19.2" Condition="'$(GpuType)'=='CUDA'" />
6262
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='MPS'" />
63-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.19.2" Condition="'$(GpuType)'=='DirectML'" />
63+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.20.1" Condition="'$(GpuType)'=='DirectML'" />
6464
<!-- https://github.com/microsoft/onnxruntime/issues/12677#issuecomment-1443802719 -->
65-
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.2" Condition="'$(GpuType)'=='DirectML'" />
65+
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.4" Condition="'$(GpuType)'=='DirectML'" />
6666

6767
</ItemGroup>
6868

6969
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
70-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
70+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
7171
</ItemGroup>
7272

7373
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- NOT Mac Apple Silicon -->
74-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
74+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
7575
</ItemGroup>
7676

7777
<!-- Output the settings based on what we've determined above -->

‎src/server/Server.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=v
8383
</ItemGroup>
8484

8585
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
86-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
87-
<PackageReference Include="System.Text.Json" Version="8.0.0" />
88-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
89-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
90-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
86+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
87+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
88+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
89+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
90+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
9191
</ItemGroup>
9292

9393
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- Everything else -->
94-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
95-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
96-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.1" />
97-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
98-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
94+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
95+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
96+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
97+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
98+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
9999
</ItemGroup>
100100

101101
<ItemGroup>

‎tests/CodeProject.AI.SDK.Tests/CodeProject.AI.SDK.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1717
<PackageReference Include="xunit" Version="2.9.2" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1919
<PrivateAssets>all</PrivateAssets>

‎tests/QueueServiceTests/CodeProject.AI.API.Server.Backend.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1616
<PackageReference Include="xunit" Version="2.9.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎utils/ParseJSON/ParseJSON.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
</PropertyGroup>
5151

5252
<ItemGroup>
53-
<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
54-
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
53+
<PackageReference Include="System.Text.Json" Version="9.0.0" Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" /> <!-- Mac Apple Silicon -->
54+
<PackageReference Include="System.Text.Json" Version="9.0.0" Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" /> <!-- Everything else -->
5555
</ItemGroup>
5656

5757
<ItemGroup>

0 commit comments

Comments
 (0)