Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"settings": {
"dotnet-interactive.kernelTransportArgs": [
"{dotnet_path}",
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
"[vscode]",
"stdio",
"--working-dir",
"{working_dir}"
],
"dotnet-interactive.notebookParserArgs": [
"{dotnet_path}",
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
"/workspaces/interactive/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
"notebook-parser"
],
"editor.formatOnSave": true,
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPER-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ If you've made changes to `dotnet-interactive` and want to try them out with Vis
```json
"dotnet-interactive.kernelTransportArgs": [
"{dotnet_path}",
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
"[vscode]",
"stdio",
"--log-path",
Expand All @@ -135,7 +135,7 @@ If you've made changes to `dotnet-interactive` and want to try them out with Vis

"dotnet-interactive.notebookParserArgs": [
"{dotnet_path}",
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net9.0/Microsoft.DotNet.Interactive.App.dll",
"/PATH/TO/REPO/ROOT/artifacts/bin/dotnet-interactive/Debug/net10.0/Microsoft.DotNet.Interactive.App.dll",
"notebook-parser",
"--log-path",
"/path/to/a/folder/for/your/parser-logs/",
Expand Down
8 changes: 3 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<RoslynVersion>4.14.0</RoslynVersion>
<RoslynVersion>5.0.0</RoslynVersion>
</PropertyGroup>
<PropertyGroup Label="Properties used for generating package references (#r nuget) at runtime. Inlining these might cause some tests to fail.">
<HumanizerVersion>2.14.1</HumanizerVersion>
Expand All @@ -19,8 +19,8 @@
<PackageVersion Include="DuckDB.NET.Data" Version="1.3.0" />
<PackageVersion Include="AwesomeAssertions.Json" Version="8.0.0" />
<PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
<PackageVersion Include="FSharp.Compiler.Service" Version="43.9.300" />
<PackageVersion Include="FSharp.Core" Version="9.0.300" />
<PackageVersion Include="FSharp.Compiler.Service" Version="43.10.100" />
<PackageVersion Include="FSharp.Core" Version="10.0.100" />
<PackageVersion Include="HtmlAgilityPack" Version="1.11.57" />
<PackageVersion Include="Humanizer.Core" Version="$(HumanizerVersion)" />
<PackageVersion Include="Humanizer" Version="$(HumanizerVersion)" />
Expand Down Expand Up @@ -89,13 +89,11 @@
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.6" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
<PackageVersion Include="System.IO.Pipelines" Version="9.0.6" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.6" />
<PackageVersion Include="System.Runtime.Caching" Version="9.0.6" />
<PackageVersion Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
Expand Down
4 changes: 2 additions & 2 deletions eng/AfterSolutionBuild.targets
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<ItemGroup>
<SymbolPackageWithBadFiles Include="$(ArtifactsShippingPackagesDir)\Microsoft.dotnet-interactive.*.symbols.nupkg" />

<SymbolPackageFilesToStrip Include="tools/net9.0/any/runtimes/linux-musl-x64/native/libpsl-native.so" />
<SymbolPackageFilesToStrip Include="tools/net9.0/any/runtimes/linux-x64/native/libmi.so" />
<SymbolPackageFilesToStrip Include="tools/net10.0/any/runtimes/linux-musl-x64/native/libpsl-native.so" />
<SymbolPackageFilesToStrip Include="tools/net10.0/any/runtimes/linux-x64/native/libmi.so" />
</ItemGroup>
<PropertyGroup>
<PackageTempPath>$([System.IO.Path]::GetTempPath())/$([System.Guid]::NewGuid())</PackageTempPath>
Expand Down
2 changes: 1 addition & 1 deletion eng/perf-tests/perf-tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>PerfTests</RootNamespace>
<NoWarn>$(NoWarn);CS8032</NoWarn><!-- An instance of analyzer...cannot be created -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.111",
"version": "10.0.100",
"rollForward": "latestMinor",
"allowPrerelease": false
},
"tools": {
"dotnet": "9.0.111",
"dotnet": "10.0.100",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
Expand Down
2 changes: 1 addition & 1 deletion samples/connect-wpf/WpfConnect.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<DisableArcade>1</DisableArcade>
Expand Down
2 changes: 1 addition & 1 deletion samples/extensions/ClockExtension/ClockExtension.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IncludeBuildOutput>true</IncludeBuildOutput>
<IsPackable>true</IsPackable>
<PackageDescription>Formats dates as an SVG clock in .NET Interactive</PackageDescription>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/extensions/Library.nuget/Library.nuget.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>

<PackageId>Library</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion samples/extensions/Library/Library.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/simple-fsharp-console/FSharpConsole.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Deterministic Condition="'$(NCrunch)' == '1'">false</Deterministic>
<NoWarn>$(NoWarn);VSTHRD200</NoWarn> <!-- Ignore: Use "Async" suffix for async methods -->
<NoWarn>$(NoWarn);8002</NoWarn> <!-- Assent isn't strongly signed -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Ignore: Use "Async" suffix for async methods -->
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Library</OutputType>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>preview</LangVersion>
<!-- Ignore: warning NU1608: Detected package version outside of dependency constraint:
xunit 2.4.1 requires xunit.core (= 2.4.1) but version xunit.core 2.4.2 was resolved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Deterministic Condition="'$(NCrunch)' == '1'">false</Deterministic>
<NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Ignore: Use "Async" suffix for async methods -->
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Interactive.CSharp/CSharpKernel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public CSharpKernel() : this(DefaultKernelName)
public CSharpKernel(string name) : base(name)
{
KernelInfo.LanguageName = "C#";
KernelInfo.LanguageVersion = "13.0";
KernelInfo.LanguageVersion = "14.0";
KernelInfo.DisplayName = $"{KernelInfo.LocalName} - C# Script";
KernelInfo.Description = """
Compile and run C# Script
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssetTargetFallback>portable-net45+win8+wp8+wpa81</AssetTargetFallback>
<NoWarn>$(NoWarn);VSTHRD002</NoWarn><!-- Ignore: Synchronosly awaiting... -->
<NoWarn>$(NoWarn);VSTHRD100</NoWarn><!-- Ignore: Synchronosly awaiting... -->
Expand Down Expand Up @@ -61,7 +61,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Reactive" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -913,20 +913,22 @@ public async Task Can_compile_c_sharp_8_features()
{
var server = GetCodeRunner();

var workspace = Workspace.FromSource(@"
using System;
var workspace = Workspace.FromSource(
"""
using System;

public static class Hello
{
public static void Main()
{
var i1 = 3; // number 3 from beginning
var i2 = ^4; // number 4 from end
var a = new[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
Console.WriteLine($""{a[i1]}, {a[i2]}"");
}
}
", workspaceType: "console");
public static class Hello
{
public static void Main()
{
var i1 = 3; // number 3 from beginning
var i2 = ^4; // number 4 from end
var a = new[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
Console.WriteLine($"{a[i1]}, {a[i2]}");
}
}

""", workspaceType: "console");

var result = await server.RunAsync(new WorkspaceRequest(workspace));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
<LangVersion>preview</LangVersion>
Expand Down Expand Up @@ -49,7 +49,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" />
<PackageReference Include="System.Runtime.InteropServices" />
<PackageReference Include="System.Security.Cryptography.Xml" />
<PackageReference Include="System.Security.Cryptography.Pkcs" />
<PackageReference Include="PocketLogger">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
using Microsoft.DotNet.Interactive.Documents.Jupyter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<NoWarn>$(NoWarn);8002</NoWarn><!-- Assent isn't strongly signed -->
<NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Ignore: Use "Async" suffix for async methods -->
<NoWarn>$(NoWarn);CS8509</NoWarn><!-- The switch expression does not handle all possible values of its input type (it is not exhaustive). For example, the pattern '""' is not covered. Microsoft.DotNet.Interactive.Documents.Tests C:\dev\interactive\src\Microsoft.DotNet.Interactive.Documents.Tests\ImportNotebookTests.cs 50 Active -->
Expand All @@ -23,7 +23,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="Assent" />
<PackageReference Include="Serilog.Sinks.RollingFileAlternate" />
<PackageReference Include="AwesomeAssertions" />
Expand All @@ -43,7 +42,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FSharp.Core" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>preview</LangVersion>
<NoWarn>$(NoWarn);8002;VSTHRD002;VSTHRD200</NoWarn> <!-- Assent isn't strongly signed -->
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion>
<PackageId Condition="'$(PackageId)'==''">Microsoft.DotNet.Interactive.DuckDB</PackageId>
<NoWarn>$(NoWarn);8002;CS8002</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>preview</LangVersion>
<NoWarn>$(NoWarn);8002;VSTHRD002;VSTHRD200</NoWarn> <!-- Assent isn't strongly signed -->
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Library</OutputType>
</PropertyGroup>

Expand All @@ -21,15 +21,12 @@
<None Remove="bin\**" />
</ItemGroup>



<ItemGroup>
<PackageReference Include="Microsoft.Data.Analysis" />
<PackageReference Include="Iced" />
<PackageReference Include="ICSharpCode.Decompiler" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" />
<PackageReference Include="System.Runtime.InteropServices" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading