Skip to content

Commit 33ded6f

Browse files
jonsequiturJon Sequeira
andauthored
update to .NET 10 (#4093)
* update to .NET 10 * fix up warnings and tests * fix a few tests that fail only in Arcade * disable tests that are failing because of httpbin.org outage --------- Co-authored-by: Jon Sequeira <[email protected]>
1 parent 79c1539 commit 33ded6f

File tree

79 files changed

+268
-233
lines changed

Some content is hidden

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

79 files changed

+268
-233
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"settings": {
1717
"dotnet-interactive.kernelTransportArgs": [
1818
"{dotnet_path}",
19-
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
19+
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
2020
"[vscode]",
2121
"stdio",
2222
"--working-dir",
2323
"{working_dir}"
2424
],
2525
"dotnet-interactive.notebookParserArgs": [
2626
"{dotnet_path}",
27-
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
27+
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
2828
"notebook-parser"
2929
],
3030
"editor.formatOnSave": true,

DEVELOPER-GUIDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ If you've made changes to `dotnet-interactive` and want to try them out with Vis
123123
```json
124124
"dotnet-interactive.kernelTransportArgs": [
125125
"{dotnet_path}",
126-
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
126+
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
127127
"[vscode]",
128128
"stdio",
129129
"--log-path",
@@ -135,7 +135,7 @@ If you've made changes to `dotnet-interactive` and want to try them out with Vis
135135

136136
"dotnet-interactive.notebookParserArgs": [
137137
"{dotnet_path}",
138-
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
138+
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
139139
"notebook-parser",
140140
"--log-path",
141141
"/path/to/a/folder/for/your/parser-logs/",

Directory.Packages.props

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
<RoslynVersion>4.14.0</RoslynVersion>
5+
<RoslynVersion>5.0.0</RoslynVersion>
66
</PropertyGroup>
77
<PropertyGroup Label="Properties used for generating package references (#r nuget) at runtime. Inlining these might cause some tests to fail.">
88
<HumanizerVersion>2.14.1</HumanizerVersion>
9-
<MicrosoftDataSqlClientVersion>6.0.2</MicrosoftDataSqlClientVersion>
9+
<MicrosoftDataSqlClientVersion>6.1.3</MicrosoftDataSqlClientVersion>
1010
<MicrosoftIdentityClientVersion>4.66.2</MicrosoftIdentityClientVersion>
11-
<MicrosoftEntityFrameworkVersion>9.0.6</MicrosoftEntityFrameworkVersion>
11+
<MicrosoftEntityFrameworkVersion>10.0.0</MicrosoftEntityFrameworkVersion>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageVersion Include="Assent" Version="2.3.2" />
15-
<PackageVersion Include="Azure.Core" Version="1.44.1" />
16-
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
15+
<PackageVersion Include="Azure.Core" Version="1.50.0" />
16+
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
1717
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
18-
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.3.0" />
18+
<PackageVersion Include="DuckDB.NET.Data.Full" Version="1.4.1" />
1919
<PackageVersion Include="DuckDB.NET.Data" Version="1.3.0" />
2020
<PackageVersion Include="AwesomeAssertions.Json" Version="8.0.0" />
2121
<PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
22-
<PackageVersion Include="FSharp.Compiler.Service" Version="43.9.300" />
23-
<PackageVersion Include="FSharp.Core" Version="9.0.300" />
22+
<PackageVersion Include="FSharp.Compiler.Service" Version="43.10.100" />
23+
<PackageVersion Include="FSharp.Core" Version="10.0.100" />
2424
<PackageVersion Include="HtmlAgilityPack" Version="1.11.57" />
2525
<PackageVersion Include="Humanizer.Core" Version="$(HumanizerVersion)" />
2626
<PackageVersion Include="Humanizer" Version="$(HumanizerVersion)" />
@@ -32,10 +32,10 @@
3232
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
3333
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />
3434
<PackageVersion Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.3.0" />
35-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />
36-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.6" />
35+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
36+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
3737
<PackageVersion Include="Microsoft.Azure.Kusto.Data" Version="13.0.2" />
38-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
38+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
3939
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
4040
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
4141
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynVersion)" />
@@ -49,27 +49,27 @@
4949
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(RoslynVersion)" />
5050
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(RoslynVersion)" />
5151
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
52-
<PackageVersion Include="Microsoft.Data.Analysis" Version="0.22.2" />
52+
<PackageVersion Include="Microsoft.Data.Analysis" Version="0.23.0" />
5353
<PackageVersion Include="Microsoft.Data.SqlClient" Version="$(MicrosoftDataSqlClientVersion)" />
54-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
54+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
5555
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="2.2.343001" />
5656
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
5757
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkVersion)" />
5858
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkVersion)" />
59-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
60-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
59+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
60+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
6161
<PackageVersion Include="Microsoft.IdentityClient" Version="$(MicrosoftIdentityClientVersion)" />
62-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" Condition="'$(DisableArcade)' == '1'" />
62+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" Condition="'$(DisableArcade)' == '1'" />
6363
<PackageVersion Include="microsoft.playwright" Version="1.52.0" />
6464
<PackageVersion Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
65-
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.1" />
65+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
6666
<PackageVersion Include="Microsoft.PowerShell.SecretManagement" Version="1.1.2" />
6767
<PackageVersion Include="Microsoft.PowerShell.SecretStore" Version="1.0.6" />
6868
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.0" />
6969
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
7070
<PackageVersion Include="Nerdbank.Streams" Version="2.11.90" />
7171
<PackageVersion Include="NetMQ" Version="4.0.1.13" />
72-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
72+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
7373
<PackageVersion Include="Npgsql" Version="9.0.3" />
7474
<PackageVersion Include="PackageManagement" Version="1.4.8.1" />
7575
<PackageVersion Include="Pocket.Disposable" Version="1.2.0" />
@@ -83,24 +83,22 @@
8383
<PackageVersion Include="Serilog" Version="4.2.0" />
8484
<PackageVersion Include="SkiaSharp" Version="3.119.0" />
8585
<PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
86-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.6" />
86+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
8787
<PackageVersion Include="System.CommandLine" Version="2.0.0" />
8888
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
89-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
90-
<PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
91-
<PackageVersion Include="System.IO.Pipelines" Version="9.0.6" />
92-
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
89+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
90+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
91+
<PackageVersion Include="System.IO.Pipelines" Version="10.0.0" />
9392
<PackageVersion Include="System.Memory" Version="4.6.3" />
9493
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
9594
<PackageVersion Include="System.Reactive" Version="6.0.0" />
96-
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.6" />
97-
<PackageVersion Include="System.Runtime.Caching" Version="9.0.6" />
98-
<PackageVersion Include="System.Runtime.InteropServices" Version="4.3.0" />
95+
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0" />
96+
<PackageVersion Include="System.Runtime.Caching" Version="10.0.0" />
9997
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
100-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
98+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
10199
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
102-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.6" />
103-
<PackageVersion Include="System.Text.Json" Version="9.0.6" />
100+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
101+
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
104102
<PackageVersion Include="ThreadJob" Version="2.0.3" />
105103
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
106104
<PackageVersion Include="xunit" Version="2.7.0" />

eng/AfterSolutionBuild.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<ItemGroup>
4444
<SymbolPackageWithBadFiles Include="$(ArtifactsShippingPackagesDir)\Microsoft.dotnet-interactive.*.symbols.nupkg" />
4545

46-
<SymbolPackageFilesToStrip Include="tools/net9.0/any/runtimes/linux-musl-x64/native/libpsl-native.so" />
47-
<SymbolPackageFilesToStrip Include="tools/net9.0/any/runtimes/linux-x64/native/libmi.so" />
46+
<SymbolPackageFilesToStrip Include="tools/net10.0/any/runtimes/linux-musl-x64/native/libpsl-native.so" />
47+
<SymbolPackageFilesToStrip Include="tools/net10.0/any/runtimes/linux-x64/native/libmi.so" />
4848
</ItemGroup>
4949
<PropertyGroup>
5050
<PackageTempPath>$([System.IO.Path]::GetTempPath())/$([System.Guid]::NewGuid())</PackageTempPath>

eng/perf-tests/perf-tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>PerfTests</RootNamespace>
77
<NoWarn>$(NoWarn);CS8032</NoWarn><!-- An instance of analyzer...cannot be created -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "9.0.111",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
},
77
"tools": {
8-
"dotnet": "9.0.111",
8+
"dotnet": "10.0.100",
99
"rollForward": "latestMinor"
1010
},
1111
"msbuild-sdks": {

samples/connect-wpf/WpfConnect.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<UseWPF>true</UseWPF>
77
<DisableArcade>1</DisableArcade>

samples/extensions/ClockExtension/ClockExtension.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IncludeBuildOutput>true</IncludeBuildOutput>
77
<IsPackable>true</IsPackable>
88
<PackageDescription>Formats dates as an SVG clock in .NET Interactive</PackageDescription>

samples/extensions/Library.InteractiveExtension/Library.InteractiveExtension.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<OutputType>Library</OutputType>
9-
<TargetFramework>net9.0</TargetFramework>
9+
<TargetFramework>net10.0</TargetFramework>
1010
</PropertyGroup>
1111

1212
</Project>

samples/extensions/Library.nuget/Library.nuget.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IncludeBuildOutput>false</IncludeBuildOutput>
77

88
<PackageId>Library</PackageId>

0 commit comments

Comments
 (0)