Skip to content

Commit b50299b

Browse files
stephentoubstephentoub
authored
Upgrade to .NET 10 (#13395)
1 parent 775b8fc commit b50299b

File tree

489 files changed

+1129
-1774
lines changed

Some content is hidden

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

489 files changed

+1129
-1774
lines changed

‎.github/workflows/dotnet-build-and-test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ jobs:
5757
matrix:
5858
include:
5959
- {
60-
dotnet: "8.0",
60+
dotnet: "10.0",
6161
os: "ubuntu-latest",
6262
configuration: Release,
6363
integration-tests: true,
6464
environment: "integration",
6565
}
66-
- { dotnet: "8.0", os: "windows-latest", configuration: Debug }
67-
- { dotnet: "8.0", os: "windows-latest", configuration: Release }
66+
- { dotnet: "10.0", os: "windows-latest", configuration: Debug }
67+
- { dotnet: "9.0", os: "windows-latest", configuration: Release }
6868

6969
runs-on: ${{ matrix.os }}
7070
environment: ${{ matrix.environment }}
@@ -138,7 +138,7 @@ jobs:
138138
run: |
139139
export INTEGRATION_TEST_PROJECTS=$(find ./dotnet -type f -name "*IntegrationTests.csproj" | grep -v "Experimental.Orchestration.Flow.IntegrationTests.csproj" | grep -v "VectorDataIntegrationTests.csproj" | tr '\n' ' ')
140140
for project in $INTEGRATION_TEST_PROJECTS; do
141-
dotnet test -f net8.0 -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
141+
dotnet test -f net10.0 -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
142142
done
143143
env:
144144
# Azure OpenAI Deployments

‎.github/workflows/dotnet-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
include:
22-
- { os: ubuntu-latest, dotnet: '8.0', configuration: Debug }
23-
- { os: ubuntu-latest, dotnet: '8.0', configuration: Release }
22+
- { os: ubuntu-latest, dotnet: '10.0', configuration: Debug }
23+
- { os: ubuntu-latest, dotnet: '10.0', configuration: Release }
2424

2525
runs-on: ${{ matrix.os }}
2626
steps:
@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [windows-latest]
6969
configuration: [Release, Debug]
70-
dotnet-version: ['8.0.x']
70+
dotnet-version: ['10.0.x']
7171
runs-on: ${{ matrix.os }}
7272
env:
7373
NUGET_CERT_REVOCATION_MODE: offline

‎.github/workflows/dotnet-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
include:
28-
- { dotnet: "9.0", configuration: Release, os: ubuntu-latest }
28+
- { dotnet: "10.0", configuration: Release, os: ubuntu-latest }
2929

3030
runs-on: ${{ matrix.os }}
3131
env:

‎.github/workflows/dotnet-integration-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/setup-dotnet@v4
3333
if: ${{ github.event_name != 'pull_request' }}
3434
with:
35-
dotnet-version: 8.0.x
35+
dotnet-version: 10.0.x
3636

3737
- name: Find projects
3838
shell: bash

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Semantic Kernel is a model-agnostic SDK that empowers developers to build, orche
1515
## System Requirements
1616

1717
- **Python**: 3.10+
18-
- **.NET**: .NET 8.0+
18+
- **.NET**: .NET 10.0+
1919
- **Java**: JDK 17+
2020
- **OS Support**: Windows, macOS, Linux
2121

‎docs/decisions/0025-planner-telemetry-enhancement.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private void CaptureUsageDetails(string? modelId, IDictionary<string, object?>?
142142
var completionTokens = 0;
143143
try
144144
{
145-
var jsonObject = JsonSerializer.Deserialize<JsonElement>(JsonSerializer.Serialize(usageObject));
145+
var jsonObject = JsonElement.Parse(JsonSerializer.Serialize(usageObject));
146146
promptTokens = jsonObject.GetProperty("PromptTokens").GetInt32();
147147
completionTokens = jsonObject.GetProperty("CompletionTokens").GetInt32();
148148
}

‎dotnet/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
77
<AnalysisLevel>latest</AnalysisLevel>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<LangVersion>12</LangVersion>
9+
<LangVersion>14</LangVersion>
1010
<Nullable>enable</Nullable>
1111
<ImplicitUsings>disable</ImplicitUsings>
1212
<NoWarn>$(NoWarn);IDE0290;IDE0079</NoWarn>

‎dotnet/Directory.Packages.props‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<ItemGroup>
88
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="9.3.1-preview.1.25305.6" />
99
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="9.5.1" />
10-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.1" />
11-
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.5.1" />
12-
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.5.1" />
13-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Dapr" Version="9.3.0" />
14-
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.NodeJS.Extensions" Version="9.3.0" />
15-
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.5.1" />
10+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
11+
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="13.0.0" />
12+
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
13+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Dapr" Version="9.9.0" />
14+
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.NodeJS.Extensions" Version="9.9.0" />
15+
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="13.0.0" />
1616
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.5.7" />
1717
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.6.3" />
1818
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.7.2" />
@@ -64,9 +64,10 @@
6464
<PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="12.2.8" />
6565
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
6666
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.2" />
67-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
67+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
6868
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
69-
<PackageVersion Include="Microsoft.Bcl.Numerics" Version="9.0.10" />
69+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.0" />
70+
<PackageVersion Include="Microsoft.Bcl.Numerics" Version="10.0.0" />
7071
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
7172
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
7273
<PackageVersion Include="Microsoft.Identity.Client" Version="4.77.1" />
@@ -75,38 +76,37 @@
7576
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.22.1" />
7677
<PackageVersion Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.22.1" />
7778
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
78-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.65.0" />
79-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.58.0" />
80-
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.65.0" />
79+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.67.1" />
80+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.67.1" />
81+
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.67.1" />
8182
<PackageVersion Include="Microsoft.SemanticKernel.Planners.OpenAI" Version="1.47.0-preview" />
8283
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
83-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10" />
84+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
8485
<PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
8586
<PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
8687
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
8788
<PackageVersion Include="Npgsql" Version="8.0.7" />
8889
<PackageVersion Include="OData2Linq" Version="2.2.0" />
89-
<PackageVersion Include="OllamaSharp" Version="5.3.5" />
90+
<PackageVersion Include="OllamaSharp" Version="5.4.11" />
9091
<PackageVersion Include="OpenAI" Version="2.5.0" />
91-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
92-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
93-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
94-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
95-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
96-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
92+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
93+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
94+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
95+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
96+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
97+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
9798
<PackageVersion Include="PdfPig" Version="0.1.11" />
9899
<PackageVersion Include="Pinecone.Client" Version="3.1.0" />
99100
<PackageVersion Include="Prompty.Core" Version="0.2.3-beta" />
100101
<PackageVersion Include="PuppeteerSharp" Version="20.0.5" />
101-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
102+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
102103
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
103-
<PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
104-
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0-rc.2.25502.107" />
105-
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
106-
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
104+
<PackageVersion Include="System.IO.Packaging" Version="10.0.0" />
105+
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0" />
106+
<PackageVersion Include="System.Memory.Data" Version="10.0.0" />
107107
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
108-
<PackageVersion Include="System.Numerics.Tensors" Version="9.0.10" />
109-
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
108+
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.0" />
109+
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
110110
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
111111
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
112112
<PackageVersion Include="A2A" Version="0.3.1-preview" />
@@ -119,42 +119,43 @@
119119
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
120120
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.10.0-preview.1.25513.3" />
121121
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.0-preview.1.25513.3" />
122-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
123-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
124-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
125-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
126-
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
127-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
128-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
129-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
130-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
131-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0" />
132-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
133-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
134-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
135-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
136-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
137-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
138-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
139-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
140-
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
141-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
142-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
143-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
144-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11" />
122+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
123+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
124+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
125+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
126+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0" />
127+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
128+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
129+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
130+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
131+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
132+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
133+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
134+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
135+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
136+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
137+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
138+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
139+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
140+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.0" />
141+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
142+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
143+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0" />
144+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
145145
<!-- Test -->
146-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
146+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
147147
<PackageVersion Include="Moq" Version="[4.18.4]" />
148148
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
149149
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
150-
<PackageVersion Include="System.Threading.Channels" Version="9.0.10" />
151-
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
150+
<PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
151+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="10.0.0" />
152152
<PackageVersion Include="xunit" Version="2.9.3" />
153153
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
154154
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
155155
<PackageVersion Include="xretry" Version="1.9.0" />
156156
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
157157
<PackageVersion Include="Docker.DotNet" Version="3.125.15" />
158+
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.71.0" />
158159
<PackageVersion Include="Humanizer" Version="2.14.1" />
159160
<!-- Plugins -->
160161
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.3.0" />

‎dotnet/global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "9.0.300",
4-
"rollForward": "latestMajor",
3+
"version": "10.0.100",
4+
"rollForward": "major",
55
"allowPrerelease": false
66
}
77
}

‎dotnet/notebooks/00-getting-started.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"#### Watch the Getting Started Quick Start [Video](https://aka.ms/SK-Getting-Started-Notebook)\n",
99
"\n",
1010
"> [!IMPORTANT]\n",
11-
"> You will need an [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) and [Polyglot](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-interactive-vscode) to get started with this notebook using .NET Interactive."
11+
"> You will need an [.NET 10 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0) and [Polyglot](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-interactive-vscode) to get started with this notebook using .NET Interactive."
1212
]
1313
},
1414
{

0 commit comments

Comments
 (0)