Skip to content

Commit

Permalink
merge from main (#2754)
Browse files Browse the repository at this point in the history
* change log level (#2719)

* fix handling of completions that rely on nested commands (#2727)

* fix handling of completions that rely on nested commands

* add logic to compensate for #2728

* fix package import (#2734)

* Rename the netstandard2.0 package (#2739)

Also include some additional code that we want to share.

Hide command window for child process.

* value kernel should not produce reference values (#2740)

fix


fix

* readme link 404 fix

corrected path for FAQ.md

* share cancellation source (#2743)

error

* fix size in style

* use set command

* Update publish-npm.yml

* report all errors when generating dynamic semantic tokens (#2747)

* report all errors when generating dynamic semantic tokens

* report when no tokens were produced

* fix again ... (#2749)

* improve kql and sql connection experience  (#2745)

* add tests to see reconnection


dive out error if kernel name is already present


add tests


fix test

* fix test

* Update src/Microsoft.DotNet.Interactive.Kql/ConnectKqlCommand.cs

Co-authored-by: Jon Sequeira <jonsequeira@gmail.com>

* Update src/Microsoft.DotNet.Interactive.SqlServer.Tests/MsSqlConnectionTests.cs

Co-authored-by: Jon Sequeira <jonsequeira@gmail.com>

* fix test

---------

Co-authored-by: Jon Sequeira <jonsequeira@gmail.com>

* Update README.md

* Updating the test script with the latest saved content for .dib and .ipynb files and fixing some typos

* allow persisting default values for new notebooks (#2712)

---------

Co-authored-by: Diego Colombo <dicolomb@microsoft.com>
Co-authored-by: Jon Sequeira <jonsequeira@gmail.com>
Co-authored-by: Shyam N <shyamnamboodiripad@users.noreply.github.com>
Co-authored-by: Jamie Bilinski <jbilinski@users.noreply.github.com>
Co-authored-by: Diego Colombo <colombod@me.com>
Co-authored-by: Brett V. Forsgren <brettfo@microsoft.com>
Co-authored-by: Abhitej John Bandi <aajohn@microsoft.com>
  • Loading branch information
8 people committed Feb 21, 2023
1 parent ef8149d commit 7356d6f
Show file tree
Hide file tree
Showing 30 changed files with 797 additions and 202 deletions.
96 changes: 80 additions & 16 deletions NotebookTestScript.dib
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!meta

{"kernelInfo":{"defaultKernelName":null,"items":[{"name":"csharp","languageName":"C#","aliases":["c#","cs"]},{"name":"fsharp","languageName":"F#","aliases":["f#","fs"]},{"name":"pwsh","languageName":"PowerShell","aliases":["powershell"]},{"name":"javascript","languageName":"JavaScript","aliases":["js"]},{"name":"html","languageName":"HTML"},{"name":"sql","languageName":"SQL"},{"name":"kql","languageName":"KQL"},{"name":"mermaid","languageName":"Mermaid"},{"name":"http","languageName":"HTTP"},{"name":"value"}]}}
{"kernelInfo":{"defaultKernelName":"csharp","items":[{"name":"csharp","aliases":[]}]}}

#!markdown

Expand Down Expand Up @@ -68,7 +68,7 @@ console.log(`The value is ${x}.`);

#!markdown

# Execude the next cell. After execution, the output immediately below should be:
# Execute the next cell. After execution, the output immediately below should be:

```
javascript
Expand All @@ -81,7 +81,7 @@ console.log(jsKernel.name);

#!markdown

# Execude the next cell. After execution, the output immediately below should be:
# Execute the next cell. After execution, the output immediately below should be:

```
[".NET","csharp","fsharp","html","javascript","kql","mermaid","pwsh","sql","value","vscode","webview"]
Expand All @@ -94,7 +94,7 @@ return kernels;

#!markdown

# Execude the next cell. After execution, the output immediately below should be:
# Execute the next cell. After execution, the output immediately below should be:

```
1234
Expand Down Expand Up @@ -188,7 +188,7 @@ Console.Error.Write("\x1b[0m");
#!markdown

# vscode kernel and user input prompts
This cell should prompt the user for input
This cell should prompt the user for input. Type something into the input field. Whatever you typed should be displayed in the output.

#!csharp

Expand Down Expand Up @@ -221,7 +221,16 @@ value_from_input

#!markdown

Now check the variable explorer. Is the value there in the `#!value` kernel?
Now check the variable explorer. Is the value there in the `value` kernel?

#!markdown

This should prompt you for input. Type something into the input field. Whatever you typed should be displayed in the output.

#!csharp

#!set --name csharpVarFromInput --value @input:"Please enter a value"
csharpVarFromInput

#!markdown

Expand All @@ -238,6 +247,9 @@ Now check the variable explorer. Is the value there in the `#!value` kernel?
9. The contents should look like this:

```
#!meta
{"kernelInfo":{"defaultKernelName":"fsharp","items":[{"name":"fsharp","languageName":"F#","aliases":["f#","F#"]},{"name":"vscode","aliases":["frontend"]}]}}

#!fsharp

1+1
Expand All @@ -261,20 +273,53 @@ Now check the variable explorer. Is the value there in the `#!value` kernel?
"cell_type": "code",
"execution_count": 1,
"metadata": {
"polyglot_notebook": {
"dotnet_interactive": {
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
"polyglot_notebook": {
"kernelName": "fsharp"
}
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"2\r\n"
]
"data": {
"text/html": [
"<div class=\"dni-plaintext\"><pre>2</pre></div><style>\r\n",
".dni-code-hint {\r\n",
" font-style: italic;\r\n",
" overflow: hidden;\r\n",
" white-space: nowrap;\r\n",
"}\r\n",
".dni-treeview {\r\n",
" white-space: nowrap;\r\n",
"}\r\n",
".dni-treeview td {\r\n",
" vertical-align: top;\r\n",
" text-align: start;\r\n",
"}\r\n",
"details.dni-treeview {\r\n",
" padding-left: 1em;\r\n",
"}\r\n",
"table td {\r\n",
" text-align: start;\r\n",
"}\r\n",
"table tr { \r\n",
" vertical-align: top; \r\n",
" margin: 0em 0px;\r\n",
"}\r\n",
"table tr td pre \r\n",
"{ \r\n",
" vertical-align: top !important; \r\n",
" margin: 0em 0px !important;\r\n",
"} \r\n",
"table th {\r\n",
" text-align: start;\r\n",
"}\r\n",
"</style>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [
Expand All @@ -288,8 +333,27 @@ Now check the variable explorer. Is the value there in the `#!value` kernel?
"language": "F#",
"name": ".net-fsharp"
},
"language_info": {
"name": "F#"
"polyglot_notebook": {
"kernelInfo": {
"defaultKernelName": "fsharp",
"items": [
{
"aliases": [
"f#",
"F#"
],
"languageName": "F#",
"name": "fsharp"
},
{
"aliases": [
"frontend"
],
"languageName": null,
"name": "vscode"
}
]
}
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Telemetry
The .NET Core tools collect usage data in order to help us improve your experience.The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_INTERACTIVE_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
```

To disable this message and the .NET Core welcome message, set the `DOTNET_INTERACTIVE_CLI_TELEMETRY_OPTOUT` environment variable to `true`. Note that this variable has no effect on telemetry opt out.
To disable this message and the .NET Core welcome message, set the `DOTNET_INTERACTIVE_SKIP_FIRST_TIME_EXPERIENCE` environment variable to `true`. Note that this variable has no effect on telemetry opt out.

## Contribution Guidelines

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _Our documentation is still a work in progress. There are a number of topics lis

## FAQ

If you're just starting out here, please refer to our [FAQ](./docs/FAQ.md).
If you're just starting out here, please refer to our [FAQ](./FAQ.md).

## Using notebooks

Expand Down
2 changes: 1 addition & 1 deletion dotnet-interactive.sln
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.PackageManagement", "src\Microsoft.DotNet.Interactive.PackageManagement\Microsoft.DotNet.Interactive.PackageManagement.csproj", "{53EF46D6-5E21-4507-B8C0-779B634262AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Netstandard20", "src\Microsoft.DotNet.Interactive.NetStandard20\Microsoft.DotNet.Interactive.Netstandard20.csproj", "{0FAA07B9-DBE4-47B5-939F-E1A69B975AD0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.VisualStudio", "src\Microsoft.DotNet.Interactive.VisualStudio\Microsoft.DotNet.Interactive.VisualStudio.csproj", "{0FAA07B9-DBE4-47B5-939F-E1A69B975AD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.VSCode", "src\Microsoft.DotNet.Interactive.VSCode\Microsoft.DotNet.Interactive.VSCode.csproj", "{382C875B-2CB2-4F93-B5E9-EC14CDDB2256}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion eng/publish/PublishVSCodeExtension.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ try {
Get-ChildItem "$artifactsPath\packages\Shipping\Microsoft.DotNet*.nupkg" | ForEach-Object {
$nugetPackagePath = $_.ToString()
# don't publish asp or netstandard packages
if (-Not ($nugetPackagePath -match "(CSharpProject|Netstandard20)")) {
if (-Not ($nugetPackagePath -match "(CSharpProject|VisualStudio)")) {
Write-Host "Publishing $nugetPackagePath"
if (-Not $simulate) {
dotnet nuget push $nugetPackagePath --source https://api.nuget.org/v3/index.json --api-key $nugetToken --no-symbols
Expand Down
2 changes: 1 addition & 1 deletion samples/notebooks/journey/showcaseteacher.dib
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!csharp

#r "nuget: Microsoft.DotNet.Interactive.Journey, *-*"
#r "nuget: Interactive.Extension.ImageSharp, *-*"
#r "nuget: Image-Sharp.InteractiveExtension, *-*"

#!csharp

Expand Down

0 comments on commit 7356d6f

Please sign in to comment.