merge from main

NotebookTestScript.dib

@@ -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
 
@@ -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
@@ -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"]
@@ -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
@@ -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
 
@@ -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
 
@@ -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
@@ -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": [
@@ -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,

README.md

@@ -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
 

docs/README.md

@@ -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
 

dotnet-interactive.sln

@@ -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

eng/publish/PublishVSCodeExtension.ps1

@@ -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

eng/publish/publish-npm.yml

@@ -12,7 +12,7 @@ stages:
   jobs:
   - job: Publish_NPM
     pool:
-      name: NetCore1ESPool-Internal
+      name: $(DncEngInternalBuildPool)
       demands: ImageOverride -equals windows.10.vs2019.amd64
     variables:
     - group: AzureDevOps-Artifact-Feeds-Pats

samples/notebooks/journey/showcaseteacher.dib

@@ -1,7 +1,7 @@
 #!csharp
 
 #r "nuget: Microsoft.DotNet.Interactive.Journey, *-*"
-#r "nuget: Interactive.Extension.ImageSharp, *-*"
+#r "nuget: Image-Sharp.InteractiveExtension, *-*"
 
 #!csharp