use pre release rolyn libraries to address type resolution issues

dotnet · Sep 17, 2019 · 7467cd2 · 7467cd2
1 parent 01891af
commit 7467cd2
Show file tree

Hide file tree

Showing 10 changed files with 216 additions and 136 deletions.
diff --git a/FSharpWorkspaceShim/FSharpWorkspaceShim.fsproj b/FSharpWorkspaceShim/FSharpWorkspaceShim.fsproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Compiler.Service" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.4.0-beta2-19467-02" />
   </ItemGroup>
 
 </Project>
diff --git a/MLS.Agent.Tools/MLS.Agent.Tools.csproj b/MLS.Agent.Tools/MLS.Agent.Tools.csproj
@@ -24,8 +24,8 @@
     </PackageReference>
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.4.0-beta2-19467-02" />
     <PackageReference Include="TaskExtensions" Version="0.1.8580001">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Microsoft.DotNet.Try.Project.Tests/Microsoft.DotNet.Try.Project.Tests.csproj b/Microsoft.DotNet.Try.Project.Tests/Microsoft.DotNet.Try.Project.Tests.csproj
@@ -17,10 +17,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0-beta2-19467-02" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Microsoft.DotNet.Try.Project/Microsoft.DotNet.Try.Project.csproj b/Microsoft.DotNet.Try.Project/Microsoft.DotNet.Try.Project.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0-beta2-19467-02" />
     <PackageReference Include="Pocket.Disposable" Version="1.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Microsoft.DotNet.Try.Protocol.Tests/Microsoft.DotNet.Try.Protocol.Tests.csproj b/Microsoft.DotNet.Try.Protocol.Tests/Microsoft.DotNet.Try.Protocol.Tests.csproj
@@ -18,11 +18,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.2.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0-beta2-19467-02" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.4.0-beta2-19467-02" />
     <PackageReference Include="Pocket.Disposable" Version="1.0.5">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/NotebookExamples/csharp/Plotting with Xplot.ipynb b/NotebookExamples/csharp/Plotting with Xplot.ipynb
@@ -9,7 +9,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -25,21 +25,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/html": [
-       "<div id=\"fbcbb567-1b33-41e9-b511-e1904e90ccb0\" style=\"width: 700px; height: 500px;\"></div><script type=\"text/javascript\">\r\n",
+       "<div id=\"1f383acd-c690-45c5-9ba4-c94d37431a16\" style=\"width: 700px; height: 500px;\"></div><script type=\"text/javascript\">\r\n",
        "\r\n",
        "var renderPlotly = function() {\r\n",
        "    var xplotRequire = requirejs.config({context:'xplot-2.0.0',paths:{plotly:'https://cdn.plot.ly/plotly-1.49.2.min'}});\r\n",
        "    xplotRequire(['plotly'], function(Plotly) {\r\n",
        "\n",
        "            var data = [{\"type\":\"scatter\",\"x\":[1,2,3,4],\"y\":[10,15,13,17],\"name\":\"Open\"},{\"type\":\"scatter\",\"x\":[2,3,4,5],\"y\":[16,5,11,9],\"name\":\"Close\"}];\n",
        "            var layout = {\"title\":\"Open vs Close\"};\n",
-       "            Plotly.newPlot('fbcbb567-1b33-41e9-b511-e1904e90ccb0', data, layout);\n",
+       "            Plotly.newPlot('1f383acd-c690-45c5-9ba4-c94d37431a16', data, layout);\n",
        "        });\r\n",
        "};\r\n",
        "if ((typeof(requirejs) !==  typeof(Function)) || (typeof(requirejs.config) !== typeof(Function))) { \r\n",
@@ -91,21 +91,39 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
-     "ename": "Unhandled Exception",
-     "evalue": "(3,20): error CS1503: Argument 1: cannot convert from 'XPlot.Plotly.Graph.Scatter[]' to 'XPlot.Plotly.Graph.Trace'",
-     "output_type": "error",
-     "traceback": []
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "(3,20): error CS1503: Argument 1: cannot convert from 'XPlot.Plotly.Graph.Scatter[]' to 'XPlot.Plotly.Graph.Trace'"
-     ]
+     "data": {
+      "text/html": [
+       "<div id=\"f05639c4-9754-4150-a545-da8a29e2d797\" style=\"width: 900px; height: 500px;\"></div><script type=\"text/javascript\">\r\n",
+       "\r\n",
+       "var renderPlotly = function() {\r\n",
+       "    var xplotRequire = requirejs.config({context:'xplot-2.0.0',paths:{plotly:'https://cdn.plot.ly/plotly-1.49.2.min'}});\r\n",
+       "    xplotRequire(['plotly'], function(Plotly) {\r\n",
+       "\n",
+       "            var data = [{\"type\":\"scatter\",\"x\":[1,2,3,4],\"y\":[10,15,13,17],\"mode\":\"markers\",\"name\":\"Open\"},{\"type\":\"scatter\",\"x\":[2,3,4,5],\"y\":[16,5,11,9],\"mode\":\"markers\",\"name\":\"Close\"}];\n",
+       "            var layout = \"\";\n",
+       "            Plotly.newPlot('f05639c4-9754-4150-a545-da8a29e2d797', data, layout);\n",
+       "        });\r\n",
+       "};\r\n",
+       "if ((typeof(requirejs) !==  typeof(Function)) || (typeof(requirejs.config) !== typeof(Function))) { \r\n",
+       "    var script = document.createElement(\"script\"); \r\n",
+       "    script.setAttribute(\"src\", \"https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js\"); \r\n",
+       "    script.onload = function(){\r\n",
+       "        renderPlotly();\r\n",
+       "    };\r\n",
+       "    document.getElementsByTagName(\"head\")[0].appendChild(script); \r\n",
+       "}\r\n",
+       "else {\r\n",
+       "    renderPlotly();\r\n",
+       "}\r\n",
+       "</script>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
     }
    ],
    "source": [
@@ -131,7 +149,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -149,21 +167,39 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
-     "ename": "Unhandled Exception",
-     "evalue": "(16,9): error CS0029: Cannot implicitly convert type 'XPlot.Plotly.PlotlyChart [C:\\Users\\dicolomb\\.dotnet\\tools\\.store\\dotnet-try\\0.0.0\\dotnet-try\\0.0.0\\tools\\netcoreapp3.0\\any\\XPlot.Plotly.dll]' to 'XPlot.Plotly.PlotlyChart [XPlot.Plotly, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]'",
-     "output_type": "error",
-     "traceback": []
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "(16,9): error CS0029: Cannot implicitly convert type 'XPlot.Plotly.PlotlyChart [C:\\Users\\dicolomb\\.dotnet\\tools\\.store\\dotnet-try\\0.0.0\\dotnet-try\\0.0.0\\tools\\netcoreapp3.0\\any\\XPlot.Plotly.dll]' to 'XPlot.Plotly.PlotlyChart [XPlot.Plotly, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]'"
-     ]
+     "data": {
+      "text/html": [
+       "<div id=\"f6957266-2fe5-4ee1-978b-cca9e4665905\" style=\"width: 900px; height: 500px;\"></div><script type=\"text/javascript\">\r\n",
+       "\r\n",
+       "var renderPlotly = function() {\r\n",
+       "    var xplotRequire = requirejs.config({context:'xplot-2.0.0',paths:{plotly:'https://cdn.plot.ly/plotly-1.49.2.min'}});\r\n",
+       "    xplotRequire(['plotly'], function(Plotly) {\r\n",
+       "\n",
+       "            var data = [{\"type\":\"histogram\",\"x\":[\"2019-09-17T18:30:36.2192793+01:00\",\"2019-09-17T18:25:36.2196443+01:00\",\"2019-09-17T18:26:36.2196467+01:00\",\"2019-09-17T18:25:36.2196472+01:00\",\"2019-09-17T18:27:36.2196478+01:00\",\"2019-09-17T18:15:36.2196491+01:00\",\"2019-09-17T18:19:36.2196503+01:00\",\"2019-09-17T18:22:36.2196515+01:00\",\"2019-09-17T18:16:36.2196522+01:00\",\"2019-09-17T18:39:36.2196527+01:00\",\"2019-09-17T18:31:36.2196531+01:00\",\"2019-09-17T18:21:36.2196535+01:00\",\"2019-09-17T18:29:36.2196542+01:00\",\"2019-09-17T18:35:36.2196547+01:00\",\"2019-09-17T18:45:36.2196551+01:00\",\"2019-09-17T18:25:36.2196556+01:00\",\"2019-09-17T18:19:36.219656+01:00\",\"2019-09-17T18:24:36.2196565+01:00\",\"2019-09-17T18:48:36.2196572+01:00\",\"2019-09-17T18:26:36.2196584+01:00\"],\"y\":[29,60,136,105,135,191,106,176,61,26,175,17,63,47,26,39,62,39,11,127],\"histfunc\":\"sum\",\"name\":\"Open\"},{\"type\":\"histogram\",\"x\":[\"2019-09-17T18:30:36.2192793+01:00\",\"2019-09-17T18:25:36.2196443+01:00\",\"2019-09-17T18:26:36.2196467+01:00\",\"2019-09-17T18:25:36.2196472+01:00\",\"2019-09-17T18:27:36.2196478+01:00\",\"2019-09-17T18:15:36.2196491+01:00\",\"2019-09-17T18:19:36.2196503+01:00\",\"2019-09-17T18:22:36.2196515+01:00\",\"2019-09-17T18:16:36.2196522+01:00\",\"2019-09-17T18:39:36.2196527+01:00\",\"2019-09-17T18:31:36.2196531+01:00\",\"2019-09-17T18:21:36.2196535+01:00\",\"2019-09-17T18:29:36.2196542+01:00\",\"2019-09-17T18:35:36.2196547+01:00\",\"2019-09-17T18:45:36.2196551+01:00\",\"2019-09-17T18:25:36.2196556+01:00\",\"2019-09-17T18:19:36.219656+01:00\",\"2019-09-17T18:24:36.2196565+01:00\",\"2019-09-17T18:48:36.2196572+01:00\",\"2019-09-17T18:26:36.2196584+01:00\"],\"y\":[36,98,168,81,35,120,147,122,24,108,114,45,177,105,39,129,13,46,2,152],\"histfunc\":\"sum\",\"name\":\"Close\"}];\n",
+       "            var layout = \"\";\n",
+       "            Plotly.newPlot('f6957266-2fe5-4ee1-978b-cca9e4665905', data, layout);\n",
+       "        });\r\n",
+       "};\r\n",
+       "if ((typeof(requirejs) !==  typeof(Function)) || (typeof(requirejs.config) !== typeof(Function))) { \r\n",
+       "    var script = document.createElement(\"script\"); \r\n",
+       "    script.setAttribute(\"src\", \"https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js\"); \r\n",
+       "    script.onload = function(){\r\n",
+       "        renderPlotly();\r\n",
+       "    };\r\n",
+       "    document.getElementsByTagName(\"head\")[0].appendChild(script); \r\n",
+       "}\r\n",
+       "else {\r\n",
+       "    renderPlotly();\r\n",
+       "}\r\n",
+       "</script>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
     }
    ],
    "source": [