Jupyter/merge from main

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23108.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23122.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5eac3ace1b09862bd7421ba55795cc2a9c6a57d5</Sha>
+      <Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

global.json

@@ -1,14 +1,14 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "7.0.103",
     "allowPrerelease": true,
     "rollForward": "latestMinor"
   },
   "tools": {
-    "dotnet": "7.0.100",
+    "dotnet": "7.0.103",
     "rollForward": "latestMinor"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4"
   }
 }

samples/notebooks/polyglot/polyglot telemetry.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":[]}]}}
 
 #!csharp
 
@@ -254,6 +254,11 @@ delay = (delayAmount) => new Promise(resolve => setTimeout(resolve, delayAmount)
 await delay(500);
 
 loadd3(["d3"], (d3) => {   
+
+    const width = 2048;
+    const height = 2048;
+    const maxR = 50;
+
     const maxStrength = d3.max(graph.edges, (e) => e.temperature);
     const minStrength = d3.min(graph.edges, (e) => e.temperature);
     const maxPopularity = d3.max(graph.nodes, (n) => n.popularity);
@@ -265,12 +270,22 @@ loadd3(["d3"], (d3) => {
     const tempScale = d3.scaleLog()
     .domain([minStrength, maxStrength])
     .range([0, 1]);
+
     const nodes = d3.map(graph.nodes, (n, i) => ({id: i, language: n.language, popularity: n.popularity/maxPopularity}));
-    const links = d3.map(graph.edges, (e, i) => ({source: e.source, target: e.destination, strength: e.temperature/maxStrength}));
+    const links = d3.map(graph.edges, (e, i) => ({source: e.source, target: e.destination, strength: e.temperature/maxStrength, weight: e.weight, id: i}));
     const color = d3.scaleOrdinal(d3.map(graph.nodes, (n, i) => n.language), d3.schemeTableau10);
-    const width = 2048;
-    const height = 2048;
-    const maxR = 50;
+
+    nodes.forEach((n,i)=>{
+      if(n.language.includes(`single`)){
+        n.x = 0;
+
+      }else{
+        n.x = width;
+      }
+
+      n.y = i + (height / nodes.lenght);
+    });
+
     const collisionScale = 2.5;
     const svg = d3.select("#forceLayout")
     .attr("width", width)
@@ -340,9 +355,10 @@ loadd3(["d3"], (d3) => {
     .selectAll(".link")
     .data(links)
     .join("path")
+    .attr("id", d => d.id)
     .attr("fill", "none")
     .attr("stroke",  d => color(nodes[d.source].language))
-    .attr("stroke-width", (d) => 3 + tempScale(d.strength) * 10)
+    .attr("stroke-width", (d) => 3 + tempScale(d.strength) * 5)
     .classed("link", true);
 
     node = svg
@@ -351,10 +367,27 @@ loadd3(["d3"], (d3) => {
     .join("g")
     .classed("node_group", true);
 
+    linkLabels = svg
+    .selectAll(".linkLabel")
+    .data(links)
+    .join("text")
+      .append("textPath")
+      .attr("font-family", "Arial, Helvetica, sans-serif")    
+      .attr("dominant-baseline","Hanging")  
+      .style("font", "normal 16px Arial")
+      .text(d => "")
+      .classed("linkLabel",true);
+
+
 
     function tick() {
           link.attr("d", linkArc);
           node.attr("transform", d => `translate(${d.x},${d.y})`);
+          linkLabels.attr("xlink:href", d => `#${d.id}`) //place the ID of the path here
+          .style("text-anchor","middle") //place the text halfway on the arc
+          .attr("startOffset", "50%")
+          .attr("fill", "white");
+
           quadtree.addAll(nodes);
       }
 
@@ -374,6 +407,7 @@ loadd3(["d3"], (d3) => {
       //node.y = Math.max(-x, Math.min(x, node.y));
       }
     }
+
     function truncateText(text, length) {
       var l = text.split(" ");
       if(notToTruncate.has(l[0])) {
@@ -385,13 +419,14 @@ loadd3(["d3"], (d3) => {
         return text;
       }
     }
+
     simulation = d3
     .forceSimulation()
     .nodes(nodes)
     .force('collision', d3.forceCollide().radius(d => scale( d.popularity ) * maxR * collisionScale))
     .force("charge", d3.forceManyBody().strength(d => scale( d.popularity ) * -200))
     .force("center", d3.forceCenter(width / 2, height / 2))
-    .force("link", d3.forceLink(links).strength ( (d) => tempScale(d.strength)  * 1.2))
+    .force("link", d3.forceLink(links).strength ( (d) => tempScale(d.strength)  * 0.01))
     .force("bounds", boxingForce)
     .on("tick", tick);
 
@@ -406,7 +441,7 @@ loadd3(["d3"], (d3) => {
     node.append("text")
     .attr("x", d=>  8 +scale( d.popularity )  * maxR)
     .attr("y", "0.31em")
-    .text(d => truncateText( d.language,10 ))
+    .text(d => truncateText( d.language, 10 ))
     .attr("fill", d => color(d.language))
     .classed("nodeText", true)
     .raise ()
@@ -417,9 +452,8 @@ loadd3(["d3"], (d3) => {
       .clone(true).lower()
       .attr("fill", "none")
       .attr("stroke", "rgba(255, 255, 255, 0.2)")
-      .attr("stroke-width", 4);
+      .attr("stroke-width", 4);    
 
-
 
     svg.on('mousemove', (e) => handleMousemove(e, quadtree));
 
@@ -481,6 +515,8 @@ loadd3(["d3"], (d3) => {
           return  c;
         });
 
+
+
         svg
         .selectAll(".link")
         .each(function (d)  {  
@@ -516,6 +552,8 @@ loadd3(["d3"], (d3) => {
         .each(function (d)  {         
           if(network.has(d.id)) {
             d3.select(this).raise();
+          }else{
+            d3.select(this).lower();
           }
         });
 
@@ -524,7 +562,27 @@ loadd3(["d3"], (d3) => {
         .each(function (d)  {         
           if(network.has(d.id)) {
             d3.select(this).raise();
+          }else{
+            d3.select(this);
           }
         });
+
+        svg
+    .selectAll(".linkLabel")
+    .data(links)
+    .each(function (d) {
+      let node = d.source;        
+      let c = color(node.language);
+      if(selectedNode){
+        const found = d.source.id === selectedNode.id || d.target.id === selectedNode.id;            
+        if(found){
+          d3.select(this).text(d => d.weight);
+        }else{
+          d3.select(this).text("");
+        }
+      }else{
+        d3.select(this).text("");
+      }   
+    });
       }     
 });

src/Microsoft.DotNet.Interactive.ApiCompatibility.Tests/ApiCompatibilityTests.Interactive_api_is_not_changed.approved.txt

@@ -695,7 +695,7 @@ Microsoft.DotNet.Interactive.Parsing
     public System.String DirectiveName { get;}
   public class KernelNameDirectiveNode : DirectiveNode
   public class LanguageNode : SyntaxNode
-    public System.String KernelName { get;}
+    public System.String Name { get;}
     public System.Collections.Generic.IEnumerable<Diagnostic> GetDiagnostics()
   public class LanguageSpecificParseResult
     public static LanguageSpecificParseResult None { get;}

src/Microsoft.DotNet.Interactive.FSharp/Microsoft.DotNet.Interactive.FSharp.fsproj

@@ -17,11 +17,6 @@
     <NoWarn>;NU5104;2003</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) AND '$(OS)' == 'Windows_NT'">
-    <!-- the 2.1.503 F# compiler can produce PDBs that can't properly be converted, see https://github.com/Microsoft/visualfsharp/issues/5976 -->
-    <PublishWindowsPdb>false</PublishWindowsPdb>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="FsAutoComplete\Utils.fs" />
     <Compile Include="FsAutoComplete\TypedAstUtils.fs" />

src/Microsoft.DotNet.Interactive.Journey/NotebookLessonParser.cs

@@ -63,7 +63,7 @@ public static async Task<InteractiveDocument> LoadNotebookFromUrl(
         var response = await client.GetAsync(uri);
         var content = await response.Content.ReadAsStringAsync();
 
-        // FIX: (LoadNotebookFromUrl) differentiate file formats
+        // TODO: (LoadNotebookFromUrl) differentiate file formats
 
         return CodeSubmission.Parse(content, GetKernelInfoFromKernel(kernel));
     }

src/Microsoft.DotNet.Interactive.PowerShell.Tests/PowerShellKernelTests.cs

@@ -171,14 +171,12 @@ public async Task GetCorrectProfilePaths()
         await kernel.SubmitCodeAsync("$currentUserCurrentHost = $PROFILE.CurrentUserCurrentHost");
         await kernel.SubmitCodeAsync("$allUsersCurrentHost = $PROFILE.AllUsersCurrentHost");
 
-        var (success, valueProduced) = await kernel.TryRequestValueAsync("currentUserCurrentHost");
-        success.Should().BeTrue();
+        var valueProduced = await kernel.RequestValueAsync("currentUserCurrentHost");
         valueProduced.Value.Should().BeOfType<string>();
         string currentUserCurrentHost = valueProduced.Value.As<string>();
 
         // Get $PROFILE default.
-        (success, valueProduced) = await kernel.TryRequestValueAsync("PROFILE");
-        success.Should().BeTrue();
+        valueProduced = await kernel.RequestValueAsync("PROFILE");
         valueProduced.Value.Should().BeOfType<string>();
         string profileDefault = valueProduced.Value.As<string>();
 
@@ -187,8 +185,7 @@ public async Task GetCorrectProfilePaths()
         profileDefault.Should().NotBeNullOrEmpty();
         profileDefault.Should().Be(currentUserCurrentHost);
 
-        (success, valueProduced) = await kernel.TryRequestValueAsync("allUsersCurrentHost");
-        success.Should().BeTrue();
+        valueProduced = await kernel.RequestValueAsync("allUsersCurrentHost");
         valueProduced.Value.Should().BeOfType<string>();
         string allUsersCurrentHost = valueProduced.Value.As<string>();
 
@@ -210,8 +207,7 @@ public async Task VerifyAllUsersProfileRuns()
             // trigger first time setup.
             await kernel.SubmitCodeAsync("Get-Date");
 
-            var (success, valueProduced) = await kernel.TryRequestValueAsync(randomVariableName);
-            success.Should().BeTrue();
+            var valueProduced = await kernel.RequestValueAsync(randomVariableName);
 
             valueProduced.Value.Should().BeOfType<bool>();
             valueProduced.Value.As<bool>().Should().BeTrue();

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

@@ -125,7 +125,7 @@ public async Task It_gives_error_if_kernel_name_is_already_used()
             .Which
             .Message
             .Should()
-            .Contain("\"A kernel with name adventureworks is already present. Use a different value for the --kernel-name option.\"");
+            .Contain("A kernel with name adventureworks is already present. Use a different value for the --kernel-name option.");
     }
 
     [MsSqlFact]

src/Microsoft.DotNet.Interactive.Tests/KeyValueStoreKernelTests.cs

@@ -52,11 +52,11 @@ await kernel.SubmitCodeAsync(
 
         var keyValueStoreKernel = kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await keyValueStoreKernel.TryRequestValueAsync("hi");
+        var valueProduced = await keyValueStoreKernel.RequestValueAsync("hi");
 
         valueProduced.FormattedValue.Value
-            .Should()
-            .Be(storedValue);
+                     .Should()
+                     .Be(storedValue);
     }
 
     [Fact]
@@ -179,7 +179,7 @@ public async Task It_can_import_file_contents_as_strings(string code)
 
         var keyValueStoreKernel = kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await keyValueStoreKernel.TryRequestValueAsync("hi");
+        var valueProduced = await keyValueStoreKernel.RequestValueAsync("hi");
 
         valueProduced.FormattedValue.Value
             .Should()
@@ -191,17 +191,33 @@ public async Task It_can_import_URL_contents_as_strings()
     {
         using var kernel = CreateKernel();
 
-        await kernel.SubmitCodeAsync("#!value --name hi --from-url http://bing.com");
+        await kernel.SubmitCodeAsync("#!value --name hi --from-url https://bing.com");
 
         var keyValueStoreKernel = kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await keyValueStoreKernel.TryRequestValueAsync("hi");
+        var valueProduced = await keyValueStoreKernel.RequestValueAsync("hi");
 
         valueProduced.FormattedValue.Value
             .Should()
             .Contain("<html");
     }
 
+    [Fact]
+    public async Task When_import_URL_contents_the_mimetype_is_preserved()
+    {
+        using var kernel = CreateKernel();
+
+        await kernel.SubmitCodeAsync("#!value --name hi --from-url https://bing.com");
+
+        var keyValueStoreKernel = kernel.FindKernelByName("value");
+
+        var valueProduced = await keyValueStoreKernel.RequestValueAsync("hi");
+
+        valueProduced.FormattedValue.MimeType
+            .Should()
+            .Be("text/html");
+    }
+
     [Fact]
     public async Task It_can_store_user_input()
     {
@@ -218,7 +234,7 @@ public async Task It_can_store_user_input()
 
         var keyValueStoreKernel = kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await keyValueStoreKernel.TryRequestValueAsync("hi");
+        var valueProduced = await keyValueStoreKernel.RequestValueAsync("hi");
 
         valueProduced.FormattedValue.Value
             .Should()
@@ -287,8 +303,7 @@ public async Task Share_into_the_value_kernel_is_not_supported_and_stores_the_di
 
         var valueKernel = (KeyValueStoreKernel)kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await valueKernel.TryRequestValueAsync("x");
-        success.Should().BeTrue();
+        var valueProduced = await valueKernel.RequestValueAsync("x");
 
         valueProduced.FormattedValue.Value.Should().Be("#!share --from fsharp f");
     }
@@ -398,12 +413,8 @@ await kernel.SubmitCodeAsync($@"
 
         var valueKernel = kernel.FindKernelByName("value");
 
-        var (success, valueProduced) = await valueKernel.TryRequestValueAsync("hi");
-
-        success
-            .Should()
-            .BeTrue();
-
+        var valueProduced = await valueKernel.RequestValueAsync("hi");
+
         valueProduced.FormattedValue.Value
             .Should()
             .Be("// previous content");