Skip to content

Commit 0abaf1f

Browse files
kayhantolgakayhantolga
committed
.NET 9 support added.
Support for .NET 6 and .NET 7 has ended. Fixed utility library issues.
1 parent b963ca7 commit 0abaf1f

13 files changed

+59
-85
lines changed

‎OpenAI.Playground/OpenAI.Playground.csproj

+10-29
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
88
<ImplicitUsings>enable</ImplicitUsings>
@@ -23,36 +23,17 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="8.0.1" />
26-
<PackageReference Include="NAudio" Version="2.2.1" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
33-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
34-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
38-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
4326
</ItemGroup>
4427

45-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
46-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
48-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
49-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
50-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
51-
</ItemGroup>
52-
53-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
54-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
55-
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
34+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
35+
<PackageReference Include="NAudio" Version="2.2.1" />
36+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
5637
</ItemGroup>
5738

5839
<ItemGroup>

‎OpenAI.SDK/Betalgo.Ranul.OpenAI.csproj

+14-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9;netstandard2.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
@@ -52,31 +52,25 @@
5252
<PackagePath>\</PackagePath>
5353
</None>
5454
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
56+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
58+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
60+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
61+
</ItemGroup>
5562
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
5663
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
5764
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
5865
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
60-
</ItemGroup>
61-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
62-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
63-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
64-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
65-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
66-
</ItemGroup>
67-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net7.0'">
68-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
69-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
70-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
7166
<PackageReference Include="System.Text.Json" Version="8.0.5" />
67+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
7268
</ItemGroup>
7369
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
74-
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
75-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
70+
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
71+
</ItemGroup>
72+
<ItemGroup>
73+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24525.1" />
74+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
7675
</ItemGroup>
77-
<ItemGroup>
78-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.0.0-preview.9.24525.1" />
79-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
80-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
81-
</ItemGroup>
8276
</Project>

‎OpenAI.Utilities.Tests/FunctionCallingHelperTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Betalgo.OpenAI.Utilities.FunctionCalling;
2-
using OpenAI.ObjectModels.RequestModels;
2+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
33

44
namespace OpenAI.Utilities.Tests;
55

‎OpenAI.Utilities.Tests/OpenAI.Utilities.Tests.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
@@ -25,7 +25,6 @@
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\OpenAI.Utilities\Betalgo.OpenAI.Utilities.csproj" />
28-
<ProjectReference Include="..\OpenAI.Utilities\OpenAI.Utilities.csproj" />
2928
</ItemGroup>
3029

3130
</Project>

‎OpenAI.Utilities/Betalgo.OpenAI.Utilities.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>Latest</LangVersion>
@@ -40,9 +40,9 @@
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="Betalgo.OpenAI" Version="8.6.2" />
43+
<PackageReference Include="Betalgo.Ranul.OpenAI" Version="8.10.1" />
4444
<PackageReference Include="CsvHelper" Version="33.0.1" />
4545
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
46-
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.1" />
46+
<PackageReference Include="Microsoft.Data.Analysis" Version="0.22.0" />
4747
</ItemGroup>
4848
</Project>

‎OpenAI.Utilities/Embedding/EmbeddingTools.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using Betalgo.OpenAI.Utilities.Extensions;
55
using CsvHelper;
66
using MathNet.Numerics;
7-
using Microsoft.Data.Analysis;
8-
using OpenAI.Interfaces;
9-
using OpenAI.ObjectModels.ResponseModels;
10-
using OpenAI.Tokenizer.GPT3;
7+
using Microsoft.Data.Analysis;
8+
using Betalgo.Ranul.OpenAI.Interfaces;
9+
using Betalgo.Ranul.OpenAI.ObjectModels.ResponseModels;
10+
using Betalgo.Ranul.OpenAI.Tokenizer.GPT3;
1111

1212
namespace Betalgo.OpenAI.Utilities.Embedding;
1313

‎OpenAI.Utilities/FunctionCalling/FunctionCallingHelper.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Reflection;
22
using System.Text.Json;
3-
using OpenAI.Builders;
4-
using OpenAI.ObjectModels.RequestModels;
5-
using OpenAI.ObjectModels.SharedModels;
3+
using Betalgo.Ranul.OpenAI.Builders;
4+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
5+
using Betalgo.Ranul.OpenAI.ObjectModels.SharedModels;
66

77
namespace Betalgo.OpenAI.Utilities.FunctionCalling;
88

‎OpenAI.Utilities/FunctionCalling/PropertyDefinitionGenerator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Reflection;
22
using System.Text.Json.Serialization;
3-
using OpenAI.ObjectModels.SharedModels;
3+
using Betalgo.Ranul.OpenAI.ObjectModels.SharedModels;
44

55
namespace Betalgo.OpenAI.Utilities.FunctionCalling;
66

‎OpenAI.UtilitiesPlayground/OpenAI.UtilitiesPlayground.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<UserSecretsId>acb2421b-1517-4212-93a4-e4eb182b4626</UserSecretsId>
99
<LangVersion>latest</LangVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
19-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
20-
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="8.0.0" />
21-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
20+
<PackageReference Include="LaserCatEyes.HttpClientListener" Version="8.0.1" />
21+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<ProjectReference Include="..\OpenAI.Utilities\Betalgo.OpenAI.Utilities.csproj" />

‎OpenAI.UtilitiesPlayground/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using LaserCatEyes.HttpClientListener;
1+
using Betalgo.Ranul.OpenAI.Extensions;
2+
using Betalgo.Ranul.OpenAI.Interfaces;
3+
using LaserCatEyes.HttpClientListener;
24
using Microsoft.Extensions.Configuration;
35
using Microsoft.Extensions.DependencyInjection;
4-
using OpenAI.Extensions;
5-
using OpenAI.Interfaces;
66
using OpenAI.UtilitiesPlayground.TestHelpers;
77

88
var builder = new ConfigurationBuilder().AddUserSecrets<Program>();

‎OpenAI.UtilitiesPlayground/TestHelpers/EmbeddingTestHelpers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Betalgo.OpenAI.Utilities.Embedding;
2-
using OpenAI.Interfaces;
3-
using OpenAI.ObjectModels;
4-
using OpenAI.ObjectModels.RequestModels;
2+
using Betalgo.Ranul.OpenAI.Interfaces;
3+
using Betalgo.Ranul.OpenAI.ObjectModels;
4+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
55

66
namespace OpenAI.UtilitiesPlayground.TestHelpers;
77

‎OpenAI.UtilitiesPlayground/TestHelpers/FunctionCallingTestHelpers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Globalization;
22
using Betalgo.OpenAI.Utilities.FunctionCalling;
3-
using OpenAI.Interfaces;
4-
using OpenAI.ObjectModels;
5-
using OpenAI.ObjectModels.RequestModels;
3+
using Betalgo.Ranul.OpenAI.Interfaces;
4+
using Betalgo.Ranul.OpenAI.ObjectModels;
5+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
66

77
namespace OpenAI.UtilitiesPlayground.TestHelpers;
88

‎OpenAI.UtilitiesPlayground/TestHelpers/JsonSchemaResponseTypeTestHelpers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Text.Json;
22
using System.Text.Json.Serialization;
33
using Betalgo.OpenAI.Utilities.FunctionCalling;
4-
using OpenAI.Interfaces;
5-
using OpenAI.ObjectModels;
6-
using OpenAI.ObjectModels.RequestModels;
4+
using Betalgo.Ranul.OpenAI.Interfaces;
5+
using Betalgo.Ranul.OpenAI.ObjectModels;
6+
using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels;
77

88
namespace OpenAI.UtilitiesPlayground.TestHelpers;
99

0 commit comments

Comments
 (0)