Skip to content

Commit 51b5e5c

Browse files
mpartipilompartipilo
committed
chore: Upgrade .NET SDK and dependencies to support .NET 9
1 parent 32ea5ad commit 51b5e5c

File tree

8 files changed

+302
-96
lines changed

8 files changed

+302
-96
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "1.0.1",
6+
"version": "1.1.2",
77
"commands": [
88
"csharpier"
99
],
1010
"rollForward": false
1111
},
1212
"nswag.consolecore": {
13-
"version": "14.4.0",
13+
"version": "14.6.1",
1414
"commands": [
1515
"nswag"
1616
],
1717
"rollForward": false
18-
},
19-
"dotnet-trx": {
20-
"version": "1.0.1",
21-
"commands": [
22-
"trx"
23-
],
24-
"rollForward": false
2518
}
2619
}
2720
}

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,5 +484,3 @@ $RECYCLE.BIN/
484484

485485
# Vim temporary swap files
486486
*.swp
487-
488-
.github/copilot-instructions.md

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "8.0.116"
4+
"version": "9.0.100",
5+
"allowPrerelease": false
56
}
67
}

‎src/Example/Example.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
</ItemGroup>
1717
<PropertyGroup>
1818
<OutputType>Exe</OutputType>
19-
<TargetFramework>net8.0</TargetFramework>
19+
<TargetFramework>net9.0</TargetFramework>
20+
<LangVersion>latest</LangVersion>
2021
<ImplicitUsings>enable</ImplicitUsings>
2122
<Nullable>enable</Nullable>
22-
<OutputPath>../bin/$(Configuration)/net8.0/win-x64/publish/</OutputPath>
23+
<OutputPath>../bin/$(Configuration)/net9.0/win-x64/publish/</OutputPath>
2324
</PropertyGroup>
2425
</Project>

‎src/Example/packages.lock.json‎

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net8.0": {
4+
"net9.0": {
55
"Microsoft.Extensions.Hosting": {
66
"type": "Direct",
77
"requested": "[9.0.0, )",
@@ -45,8 +45,8 @@
4545
},
4646
"Google.Protobuf": {
4747
"type": "Transitive",
48-
"resolved": "3.33.0",
49-
"contentHash": "+kIa03YipuiSDeRuZwcDcXS1xBQAFeGLIjuLbgJr2i+TlwBPYAqdnQZJ2SDVzIgDyy+q+n/400WyWyrJ5ZqCgQ=="
48+
"resolved": "3.30.2",
49+
"contentHash": "Y2aOVLIt75yeeEWigg9V9YnjsEm53sADtLGq0gLhwaXpk3iu8tYSoauolyhenagA2sWno2TQ2WujI0HQd6s1Vw=="
5050
},
5151
"Grpc.Core.Api": {
5252
"type": "Transitive",
@@ -64,28 +64,28 @@
6464
},
6565
"Grpc.Net.Client": {
6666
"type": "Transitive",
67-
"resolved": "2.71.0",
68-
"contentHash": "U1vr20r5ngoT9nlb7wejF28EKN+taMhJsV9XtK9MkiepTZwnKxxiarriiMfCHuDAfPUm9XUjFMn/RIuJ4YY61w==",
67+
"resolved": "2.70.0",
68+
"contentHash": "xNv0FFCVJa5S1beUtye82WFCxKThuE1jbN8DO1x1Rj8VSIWXLBUmfSID5a1fGzsU2R/EMfwPoWclJ2RMfQuGXw==",
6969
"dependencies": {
70-
"Grpc.Net.Common": "2.71.0",
70+
"Grpc.Net.Common": "2.70.0",
7171
"Microsoft.Extensions.Logging.Abstractions": "6.0.0"
7272
}
7373
},
7474
"Grpc.Net.ClientFactory": {
7575
"type": "Transitive",
76-
"resolved": "2.71.0",
77-
"contentHash": "8oPLwQLPo86fmcf9ghjCDyNsSWhtHc3CXa/AqwF8Su/pG7qAoeWWtbymsZhoNvCV9Zjzb6BDcIPKXLYt+O175g==",
76+
"resolved": "2.70.0",
77+
"contentHash": "Qg+93oj/8RdEw3PnLZNNYWnWCWyJYC/ZYZcjeln/pLaxLaPvdXES1peiqSJUI4wLFZ1JwGlbWt8+nM1i2E7ihg==",
7878
"dependencies": {
79-
"Grpc.Net.Client": "2.71.0",
79+
"Grpc.Net.Client": "2.70.0",
8080
"Microsoft.Extensions.Http": "6.0.0"
8181
}
8282
},
8383
"Grpc.Net.Common": {
8484
"type": "Transitive",
85-
"resolved": "2.71.0",
86-
"contentHash": "v0c8R97TwRYwNXlC8GyRXwYTCNufpDfUtj9la+wUrZFzVWkFJuNAltU+c0yI3zu0jl54k7en6u2WKgZgd57r2Q==",
85+
"resolved": "2.70.0",
86+
"contentHash": "rBdEUMyCwa+iB8mqC6JKyPbj3SBHHkReJj/yy/XKJI63GcG6w9DJMMGTVcYHqq4Ci2W4m0HT4jt2pFfFscar8g==",
8787
"dependencies": {
88-
"Grpc.Core.Api": "2.71.0"
88+
"Grpc.Core.Api": "2.70.0"
8989
}
9090
},
9191
"Microsoft.Extensions.Configuration": {
@@ -151,8 +151,7 @@
151151
"Microsoft.Extensions.Configuration": "9.0.0",
152152
"Microsoft.Extensions.Configuration.Abstractions": "9.0.0",
153153
"Microsoft.Extensions.Configuration.FileExtensions": "9.0.0",
154-
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.0",
155-
"System.Text.Json": "9.0.0"
154+
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.0"
156155
}
157156
},
158157
"Microsoft.Extensions.Configuration.UserSecrets": {
@@ -195,8 +194,7 @@
195194
"contentHash": "UDY7blv4DCyIJ/8CkNrQKLaAZFypXQavRZ2DWf/2zi1mxYYKKw2t8AOCBWxNntyPZHPGhtEmL3snFM98ADZqTw==",
196195
"dependencies": {
197196
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
198-
"Microsoft.Extensions.Options": "9.0.8",
199-
"System.Diagnostics.DiagnosticSource": "9.0.8"
197+
"Microsoft.Extensions.Options": "9.0.8"
200198
}
201199
},
202200
"Microsoft.Extensions.FileProviders.Abstractions": {
@@ -262,8 +260,7 @@
262260
"resolved": "9.0.8",
263261
"contentHash": "pYnAffJL7ARD/HCnnPvnFKSIHnTSmWz84WIlT9tPeQ4lHNiu0Az7N/8itihWvcF8sT+VVD5lq8V+ckMzu4SbOw==",
264262
"dependencies": {
265-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
266-
"System.Diagnostics.DiagnosticSource": "9.0.8"
263+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8"
267264
}
268265
},
269266
"Microsoft.Extensions.Logging.Configuration": {
@@ -290,8 +287,7 @@
290287
"Microsoft.Extensions.Logging": "9.0.8",
291288
"Microsoft.Extensions.Logging.Abstractions": "9.0.8",
292289
"Microsoft.Extensions.Logging.Configuration": "9.0.8",
293-
"Microsoft.Extensions.Options": "9.0.8",
294-
"System.Text.Json": "9.0.8"
290+
"Microsoft.Extensions.Options": "9.0.8"
295291
}
296292
},
297293
"Microsoft.Extensions.Logging.Debug": {
@@ -325,8 +321,7 @@
325321
"Microsoft.Extensions.Logging": "9.0.0",
326322
"Microsoft.Extensions.Logging.Abstractions": "9.0.0",
327323
"Microsoft.Extensions.Options": "9.0.0",
328-
"Microsoft.Extensions.Primitives": "9.0.0",
329-
"System.Text.Json": "9.0.0"
324+
"Microsoft.Extensions.Primitives": "9.0.0"
330325
}
331326
},
332327
"Microsoft.Extensions.Options": {
@@ -355,42 +350,18 @@
355350
"resolved": "9.0.8",
356351
"contentHash": "tizSIOEsIgSNSSh+hKeUVPK7xmTIjR8s+mJWOu1KXV3htvNQiPMFRMO17OdI1y/4ZApdBVk49u/08QGC9yvLug=="
357352
},
358-
"System.Diagnostics.DiagnosticSource": {
359-
"type": "Transitive",
360-
"resolved": "9.0.8",
361-
"contentHash": "Lj8/a1Hzli1z6jo8H9urc16GxkpVJtJM+W9fmivXMNu7nwzHziGkxn4vO0DFscMbudkEVKSezdDuHk5kgM0X/g=="
362-
},
363353
"System.Diagnostics.EventLog": {
364354
"type": "Transitive",
365355
"resolved": "9.0.0",
366356
"contentHash": "qd01+AqPhbAG14KtdtIqFk+cxHQFZ/oqRSCoxU1F+Q6Kv0cl726sl7RzU9yLFGd4BUOKdN4XojXF0pQf/R6YeA=="
367357
},
368-
"System.IO.Pipelines": {
369-
"type": "Transitive",
370-
"resolved": "9.0.8",
371-
"contentHash": "6vPmJt73mgUo1gzc/OcXlJvClz/2jxZ4TQPRfriVaLoGRH2mye530D9WHJYbFQRNMxF3PWCoeofsFdCyN7fLzA=="
372-
},
373-
"System.Text.Encodings.Web": {
374-
"type": "Transitive",
375-
"resolved": "9.0.8",
376-
"contentHash": "W+LotQsM4wBJ4PG7uRkyul4wqL4Fz7R4ty6uXrCNZUhbaHYANgrPaYR2ZpMVpdCjQEJ17Jr1NMN8hv4SHaHY4A=="
377-
},
378-
"System.Text.Json": {
379-
"type": "Transitive",
380-
"resolved": "9.0.8",
381-
"contentHash": "mIQir9jBqk0V7X0Nw5hzPJZC8DuGdf+2DS3jAVsr6rq5+/VyH5rza0XGcONJUWBrZ+G6BCwNyjWYd9lncBu48A==",
382-
"dependencies": {
383-
"System.IO.Pipelines": "9.0.8",
384-
"System.Text.Encodings.Web": "9.0.8"
385-
}
386-
},
387358
"weaviate.client": {
388359
"type": "Project",
389360
"dependencies": {
390361
"Duende.IdentityModel": "[7.1.0, )",
391-
"Google.Protobuf": "[3.33.0, )",
362+
"Google.Protobuf": "[3.30.2, )",
392363
"Grpc.HealthCheck": "[2.71.0, )",
393-
"Grpc.Net.ClientFactory": "[2.71.0, )",
364+
"Grpc.Net.ClientFactory": "[2.70.0, )",
394365
"Microsoft.Extensions.Hosting.Abstractions": "[9.0.8, )",
395366
"Microsoft.Extensions.Http": "[9.0.8, )",
396367
"Microsoft.Extensions.Logging.Console": "[9.0.8, )",
@@ -400,4 +371,4 @@
400371
}
401372
}
402373
}
403-
}
374+
}

‎src/Weaviate.Client.Tests/packages.lock.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
},
5353
"Google.Protobuf": {
5454
"type": "Transitive",
55-
"resolved": "3.33.0",
56-
"contentHash": "+kIa03YipuiSDeRuZwcDcXS1xBQAFeGLIjuLbgJr2i+TlwBPYAqdnQZJ2SDVzIgDyy+q+n/400WyWyrJ5ZqCgQ=="
55+
"resolved": "3.30.2",
56+
"contentHash": "Y2aOVLIt75yeeEWigg9V9YnjsEm53sADtLGq0gLhwaXpk3iu8tYSoauolyhenagA2sWno2TQ2WujI0HQd6s1Vw=="
5757
},
5858
"Grpc.Core.Api": {
5959
"type": "Transitive",
@@ -71,28 +71,28 @@
7171
},
7272
"Grpc.Net.Client": {
7373
"type": "Transitive",
74-
"resolved": "2.71.0",
75-
"contentHash": "U1vr20r5ngoT9nlb7wejF28EKN+taMhJsV9XtK9MkiepTZwnKxxiarriiMfCHuDAfPUm9XUjFMn/RIuJ4YY61w==",
74+
"resolved": "2.70.0",
75+
"contentHash": "xNv0FFCVJa5S1beUtye82WFCxKThuE1jbN8DO1x1Rj8VSIWXLBUmfSID5a1fGzsU2R/EMfwPoWclJ2RMfQuGXw==",
7676
"dependencies": {
77-
"Grpc.Net.Common": "2.71.0",
77+
"Grpc.Net.Common": "2.70.0",
7878
"Microsoft.Extensions.Logging.Abstractions": "6.0.0"
7979
}
8080
},
8181
"Grpc.Net.ClientFactory": {
8282
"type": "Transitive",
83-
"resolved": "2.71.0",
84-
"contentHash": "8oPLwQLPo86fmcf9ghjCDyNsSWhtHc3CXa/AqwF8Su/pG7qAoeWWtbymsZhoNvCV9Zjzb6BDcIPKXLYt+O175g==",
83+
"resolved": "2.70.0",
84+
"contentHash": "Qg+93oj/8RdEw3PnLZNNYWnWCWyJYC/ZYZcjeln/pLaxLaPvdXES1peiqSJUI4wLFZ1JwGlbWt8+nM1i2E7ihg==",
8585
"dependencies": {
86-
"Grpc.Net.Client": "2.71.0",
86+
"Grpc.Net.Client": "2.70.0",
8787
"Microsoft.Extensions.Http": "6.0.0"
8888
}
8989
},
9090
"Grpc.Net.Common": {
9191
"type": "Transitive",
92-
"resolved": "2.71.0",
93-
"contentHash": "v0c8R97TwRYwNXlC8GyRXwYTCNufpDfUtj9la+wUrZFzVWkFJuNAltU+c0yI3zu0jl54k7en6u2WKgZgd57r2Q==",
92+
"resolved": "2.70.0",
93+
"contentHash": "rBdEUMyCwa+iB8mqC6JKyPbj3SBHHkReJj/yy/XKJI63GcG6w9DJMMGTVcYHqq4Ci2W4m0HT4jt2pFfFscar8g==",
9494
"dependencies": {
95-
"Grpc.Core.Api": "2.71.0"
95+
"Grpc.Core.Api": "2.70.0"
9696
}
9797
},
9898
"Microsoft.ApplicationInsights": {
@@ -465,9 +465,9 @@
465465
"type": "Project",
466466
"dependencies": {
467467
"Duende.IdentityModel": "[7.1.0, )",
468-
"Google.Protobuf": "[3.33.0, )",
468+
"Google.Protobuf": "[3.30.2, )",
469469
"Grpc.HealthCheck": "[2.71.0, )",
470-
"Grpc.Net.ClientFactory": "[2.71.0, )",
470+
"Grpc.Net.ClientFactory": "[2.70.0, )",
471471
"Microsoft.Extensions.Hosting.Abstractions": "[9.0.8, )",
472472
"Microsoft.Extensions.Http": "[9.0.8, )",
473473
"Microsoft.Extensions.Logging.Console": "[9.0.8, )",

‎src/Weaviate.Client/Weaviate.Client.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<!-- Multi-targeting: Supports .NET 8 for compatibility and .NET 9 for latest features -->
4+
<!-- To add .NET 10 support when available, add 'net10.0' to the list below -->
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
6+
<LangVersion>latest</LangVersion>
47
<ImplicitUsings>enable</ImplicitUsings>
58
<Nullable>enable</Nullable>
69
</PropertyGroup>
710
<ItemGroup>
811
<PackageReference Include="Duende.IdentityModel" Version="7.1.0" />
9-
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
12+
<PackageReference Include="Google.Protobuf" Version="3.30.2" />
1013
<PackageReference Include="Grpc.HealthCheck" Version="2.71.0" />
11-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.71.0" />
12-
<PackageReference Include="Grpc.Tools" Version="2.76.0">
14+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.70.0" />
15+
<PackageReference Include="Grpc.Tools" Version="2.71.0">
1316
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1417
<PrivateAssets>all</PrivateAssets>
1518
</PackageReference>

0 commit comments

Comments
 (0)