From fc3c06d1df4d91e52005b27df58bca416026e933 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 17:14:23 +0100
Subject: [PATCH 01/18] test for cs 8

---
 WorkspaceServer.Tests/Kernel/CSharpReplTests.cs | 16 ++++++++++++++++
 WorkspaceServer/Kernel/CSharpRepl.cs            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/WorkspaceServer.Tests/Kernel/CSharpReplTests.cs b/WorkspaceServer.Tests/Kernel/CSharpReplTests.cs
index 20340a329..a91d30632 100644
--- a/WorkspaceServer.Tests/Kernel/CSharpReplTests.cs
+++ b/WorkspaceServer.Tests/Kernel/CSharpReplTests.cs
@@ -184,6 +184,22 @@ public async Task it_aggregates_multiple_submissions()
                         .Be(3);
         }
 
+
+        [Fact(Skip = "requires support for cs8 in roslyn scripting")]
+        public async Task it_supports_csharp_8()
+        {
+            var repl = await CreateKernelAsync();
+
+            await repl.SendAsync(new SubmitCode("var text = \"meow? meow!\";", "csharp"));
+            await repl.SendAsync(new SubmitCode("text[^5..^0]", "csharp"));
+
+            KernelEvents.OfType<ValueProduced>()
+                .Last()
+                .Value
+                .Should()
+                .Be("meow!");
+        }
+
         [Fact]
         public async Task it_can_load_assembly_references_using_r_directive()
         {
diff --git a/WorkspaceServer/Kernel/CSharpRepl.cs b/WorkspaceServer/Kernel/CSharpRepl.cs
index 19f5be42d..85b188d4e 100644
--- a/WorkspaceServer/Kernel/CSharpRepl.cs
+++ b/WorkspaceServer/Kernel/CSharpRepl.cs
@@ -23,7 +23,7 @@ public class CSharpRepl : KernelBase
 
         private ScriptState _scriptState;
 
-        protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Latest, kind: SourceCodeKind.Script);
+        protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Default, kind: SourceCodeKind.Script);
         protected ScriptOptions ScriptOptions;
 
         private StringBuilder _inputBuffer = new StringBuilder();

From 6001d2a0b8912e69654b3e150a8805a61eec2f2f Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 19:11:00 +0100
Subject: [PATCH 02/18] split code and remove code run

---
 .../CompleteRequestHandler.cs                 |  38 ++++++
 .../JupyterRequestContextHandler.cs           | 109 +-----------------
 2 files changed, 43 insertions(+), 104 deletions(-)
 create mode 100644 Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs

diff --git a/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs
new file mode 100644
index 000000000..b0b9610fb
--- /dev/null
+++ b/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs
@@ -0,0 +1,38 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Reactive.Disposables;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Try.Jupyter.Protocol;
+using WorkspaceServer.Kernel;
+
+namespace Microsoft.DotNet.Try.Jupyter
+{
+    public class CompleteRequestHandler : IDisposable
+    {
+        private readonly CompositeDisposable _disposables = new CompositeDisposable();
+        private readonly IKernel _kernel;
+
+        public CompleteRequestHandler(IKernel kernel)
+        {
+            _kernel = kernel;
+        }
+
+        public Task Handle(JupyterRequestContext context)
+        {
+            var completeRequest = context.GetRequestContent<CompleteRequest>() ??
+                                 throw new InvalidOperationException(
+                                     $"Request Content must be a not null {typeof(CompleteRequest).Name}");
+
+            context.RequestHandlerStatus.SetAsBusy();
+            context.RequestHandlerStatus.SetAsIdle();
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+            _disposables.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
index af0b7b9e3..27717d103 100644
--- a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
@@ -19,15 +19,18 @@ namespace Microsoft.DotNet.Try.Jupyter
     public class JupyterRequestContextHandler : ICommandHandler<JupyterRequestContext>
     {
         private static readonly Regex _lastToken = new Regex(@"(?<lastToken>\S+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Multiline);
-        private int _executionCount;
+
         private readonly WorkspaceServerMultiplexer _server;
         private readonly ExecuteRequestHandler _executeHandler;
+        private readonly CompleteRequestHandler _completeHandler;
 
         public JupyterRequestContextHandler(
             PackageRegistry packageRegistry,
             IKernel kernel)
         {
+            var kernel = new CSharpRepl();
             _executeHandler = new ExecuteRequestHandler(kernel);
+            _completeHandler = new CompleteRequestHandler(kernel);
 
             if (packageRegistry == null)
             {
@@ -43,9 +46,9 @@ public async Task<ICommandDeliveryResult> Handle(
             {
                 case MessageTypeValues.ExecuteRequest:
                     await _executeHandler.Handle(delivery.Command);
-                   // await HandleExecuteRequest(delivery);
                     break;
                 case MessageTypeValues.CompleteRequest:
+                    await _completeHandler.Handle(delivery.Command);
                     delivery.Command.RequestHandlerStatus.SetAsBusy();
                     await HandleCompleteRequest(delivery);
                     delivery.Command.RequestHandlerStatus.SetAsIdle();
@@ -105,108 +108,6 @@ private static int ComputeReplacementStartPosition(string code, int cursorPositi
             return pos;
         }
 
-        private async Task HandleExecuteRequest(ICommandDelivery<JupyterRequestContext> delivery)
-        {
-            var ioPubChannel = delivery.Command.IoPubChannel;
-            var serverChannel = delivery.Command.ServerChannel;
-
-            var transient = new Dictionary<string, object> { { "display_id", Guid.NewGuid().ToString() } };
-
-            var executeRequest = delivery.Command.GetRequestContent<ExecuteRequest>();
-
-            var code = executeRequest.Code;
-
-            var workspace = CreateScaffoldWorkspace(code);
-
-            var workspaceRequest = new WorkspaceRequest(workspace);
-
-            var result = await _server.Run(workspaceRequest);
-
-            if (!executeRequest.Silent)
-            {
-                _executionCount++;
-
-                var executeInput = Message.Create(
-                    new ExecuteInput(code: code, executionCount: _executionCount),
-                    delivery.Command.Request.Header);
-
-                ioPubChannel.Send(executeInput);
-            }
-
-            // execute result
-            var output = string.Join("\n", result.Output);
-
-
-            // executeResult data
-            var executeResultData = new ExecuteResult(
-                _executionCount,
-                transient: transient,
-                data: new Dictionary<string, object> {
-                    { "text/html", output},
-                    { "text/plain", output}
-                });
-
-
-            var resultSucceeded = result.Succeeded &&
-                                  result.Exception == null;
-
-            if (resultSucceeded)
-            {
-                // reply ok
-                var executeReplyPayload = new ExecuteReplyOk(executionCount: _executionCount);
-                
-
-                // send to server
-                var executeReply = Message.CreateResponse(
-                    executeReplyPayload,
-                    delivery.Command.Request);
-
-                serverChannel.Send(executeReply);
-            }
-            else
-            {
-                var errorContent = new Error(
-                     eName: string.IsNullOrWhiteSpace(result.Exception) ? "Compile Error" : "Unhandled Exception",
-                     eValue: output
-                );
-
-                //  reply Error
-                var executeReplyPayload = new ExecuteReplyError(errorContent, executionCount: _executionCount);
-
-                // send to server
-                var executeReply = Message.CreateResponse(
-                    executeReplyPayload,
-                    delivery.Command.Request);
-
-                serverChannel.Send(executeReply);
-
-                if (!executeRequest.Silent)
-                {
-                    // send on io
-                    var error = Message.Create(
-                        errorContent,
-                        delivery.Command.Request.Header);
-                    ioPubChannel.Send(error);
-
-                    // send on stderr
-                    var stdErr = new StdErrStream(errorContent.EValue);
-                    var stream = Message.Create(
-                        stdErr,
-                        delivery.Command.Request.Header);
-                    ioPubChannel.Send(stream);
-                }
-            }
-
-            if (!executeRequest.Silent && resultSucceeded)
-            {
-                // send on io
-                var executeResultMessage = Message.Create(
-                    executeResultData,
-                    delivery.Command.Request.Header);
-                ioPubChannel.Send(executeResultMessage);
-            }
-        }
-
         private static Workspace CreateScaffoldWorkspace(string code, int cursorPosition = 0)
         {
             var workspace = CreateCsharpScaffold(code, cursorPosition);

From 786dae260046687d5ae51b192082d2306d3a2d41 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 19:49:13 +0100
Subject: [PATCH 03/18] add test class for complete request handler

---
 .../CompleteRequestHandlerTests.cs            | 41 +++++++++++++++++++
 .../JupyterRequestContextHandler.cs           |  1 -
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs

diff --git a/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs b/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs
new file mode 100644
index 000000000..418dede9b
--- /dev/null
+++ b/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.DotNet.Try.Jupyter.Protocol;
+using WorkspaceServer.Kernel;
+using Xunit;
+
+namespace Microsoft.DotNet.Try.Jupyter.Tests
+{
+    public class CompleteRequestHandlerTests
+    {
+        private readonly MessageSender _ioPubChannel;
+        private readonly MessageSender _serverChannel;
+        private readonly RecordingSocket _serverRecordingSocket;
+        private readonly RecordingSocket _ioRecordingSocket;
+        private readonly KernelStatus _kernelStatus;
+
+        public CompleteRequestHandlerTests()
+        {
+            var signatureValidator = new SignatureValidator("key", "HMACSHA256");
+            _serverRecordingSocket = new RecordingSocket();
+            _serverChannel = new MessageSender(_serverRecordingSocket, signatureValidator);
+            _ioRecordingSocket = new RecordingSocket();
+            _ioPubChannel = new MessageSender(_ioRecordingSocket, signatureValidator);
+            _kernelStatus = new KernelStatus();
+        }
+
+        [Fact]
+        public void cannot_handle_requests_that_are_not_executeRequest()
+        {
+            var kernel = new CSharpRepl();
+            var handler = new ExecuteRequestHandler(kernel);
+            var request = Message.Create(new DisplayData(), null);
+            Func<Task> messageHandling = () => handler.Handle(new JupyterRequestContext(_serverChannel, _ioPubChannel, request, _kernelStatus));
+            messageHandling.Should().ThrowExactly<InvalidOperationException>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
index 27717d103..801792943 100644
--- a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;

From c36c65e800af08dbf94c377837f3d3eae48754d2 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 19:56:29 +0100
Subject: [PATCH 04/18] dispose open requests

---
 .../ExecuteRequestHandler.cs                  | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
index 435d5e9c3..35b3b9239 100644
--- a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
@@ -25,18 +25,16 @@ public class ExecuteRequestHandler : IDisposable
         private class OpenRequest : IDisposable
         {
             private readonly CompositeDisposable _disposables = new CompositeDisposable();
-            public Guid Id { get; }
             public Dictionary<string, object> Transient { get; }
             public JupyterRequestContext Context { get; }
             public ExecuteRequest ExecuteRequest { get; }
             public int ExecutionCount { get; }
 
-            public OpenRequest(JupyterRequestContext context, ExecuteRequest executeRequest, int executionCount, Guid id, Dictionary<string, object> transient)
+            public OpenRequest(JupyterRequestContext context, ExecuteRequest executeRequest, int executionCount, Dictionary<string, object> transient)
             {
                 Context = context;
                 ExecuteRequest = executeRequest;
                 ExecutionCount = executionCount;
-                Id = id;
                 Transient = transient;
             }
 
@@ -66,23 +64,23 @@ public async Task Handle(JupyterRequestContext context)
             var executeRequest = context.GetRequestContent<ExecuteRequest>() ?? throw new InvalidOperationException($"Request Content must be a not null {typeof(ExecuteRequest).Name}");
             context.RequestHandlerStatus.SetAsBusy();
             var executionCount = executeRequest.Silent ? _executionCount : Interlocked.Increment(ref _executionCount);
-        
-            try
-            {
-                var command = new SubmitCode(executeRequest.Code, "csharp");
 
-                var id = Guid.NewGuid();
+            var command = new SubmitCode(executeRequest.Code, "csharp");
+            var id = Guid.NewGuid();
+            var transient = new Dictionary<string, object> { { "display_id", id.ToString() } };
+            var openRequest = new OpenRequest(context, executeRequest, executionCount, transient);
 
-                var transient = new Dictionary<string, object> { { "display_id", id.ToString() } };
-              
-               var  openRequest = new OpenRequest(context, executeRequest, executionCount, id, transient);
-                _openRequests[command] = openRequest;
+            _openRequests[command] = openRequest;
 
+            try
+            {
                 var kernelResult = await _kernel.SendAsync(command);
                 openRequest.AddDisposable(kernelResult.KernelEvents.Subscribe(OnKernelResultEvent));
             }
             catch (Exception e)
             {
+                _openRequests.TryRemove(command, out _);
+
                 var errorContent = new Error(
                     eName: "Unhandled Exception",
                     eValue: $"{e.Message}"
@@ -141,7 +139,7 @@ void OnKernelResultEvent(IKernelEvent value)
 
         private static void OnCodeSubmissionEvaluatedFailed(CodeSubmissionEvaluationFailed codeSubmissionEvaluationFailed, ConcurrentDictionary<IKernelCommand, OpenRequest> openRequests)
         {
-            var openRequest = openRequests[codeSubmissionEvaluationFailed.Command];
+            openRequests.TryRemove(codeSubmissionEvaluationFailed.Command, out var openRequest);
 
             var errorContent = new Error(
                 eName: "Unhandled Exception",
@@ -175,12 +173,18 @@ private static void OnCodeSubmissionEvaluatedFailed(CodeSubmissionEvaluationFail
             openRequest.Context.ServerChannel.Send(executeReply);
 
             openRequest.Context.RequestHandlerStatus.SetAsIdle();
+            openRequest.Dispose();
         }
 
         private static void OnValueProduced(ValueProduced valueProduced,
             ConcurrentDictionary<IKernelCommand, OpenRequest> openRequests, RenderingEngine renderingEngine)
         {
-            var openRequest = openRequests[valueProduced.Command];
+            openRequests.TryGetValue(valueProduced.Command, out var openRequest);
+            if (openRequest == null)
+            {
+                return;
+            }
+
             try
             {
                 var rendering = renderingEngine.Render(valueProduced.Value);
@@ -231,7 +235,7 @@ private static void OnValueProduced(ValueProduced valueProduced,
         private static void OnCodeSubmissionEvaluated(CodeSubmissionEvaluated codeSubmissionEvaluated,
             ConcurrentDictionary<IKernelCommand, OpenRequest> openRequests)
         {
-            var openRequest = openRequests[codeSubmissionEvaluated.Command];
+            openRequests.TryRemove(codeSubmissionEvaluated.Command, out var openRequest);
             // reply ok
             var executeReplyPayload = new ExecuteReplyOk(executionCount: openRequest.ExecutionCount);
 
@@ -242,6 +246,7 @@ private static void OnCodeSubmissionEvaluated(CodeSubmissionEvaluated codeSubmis
 
             openRequest.Context.ServerChannel.Send(executeReply);
             openRequest.Context.RequestHandlerStatus.SetAsIdle();
+            openRequest.Dispose();
         }
 
         public void Dispose()

From 5e228b51572769ba80850565f163ed63d29d33fd Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 20:08:15 +0100
Subject: [PATCH 05/18] refactor base class for jupyter request handling

---
 .../ExecuteRequestHandler.cs                  | 53 ++++------------
 .../RequestHandlerBase.cs                     | 61 +++++++++++++++++++
 2 files changed, 73 insertions(+), 41 deletions(-)
 create mode 100644 Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs

diff --git a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
index 35b3b9239..22bb4b650 100644
--- a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
@@ -14,44 +14,15 @@
 
 namespace Microsoft.DotNet.Try.Jupyter
 {
-    public class ExecuteRequestHandler : IDisposable
+    public class ExecuteRequestHandler : RequestHandlerBase<ExecuteRequest>
     {
-        private readonly IKernel _kernel;
         private readonly RenderingEngine _renderingEngine;
-        private readonly ConcurrentDictionary<IKernelCommand, OpenRequest> _openRequests = new ConcurrentDictionary<IKernelCommand, OpenRequest>();
         private int _executionCount;
         private readonly  CompositeDisposable _disposables = new CompositeDisposable();
 
-        private class OpenRequest : IDisposable
+      
+        public ExecuteRequestHandler(IKernel kernel) :base(kernel)
         {
-            private readonly CompositeDisposable _disposables = new CompositeDisposable();
-            public Dictionary<string, object> Transient { get; }
-            public JupyterRequestContext Context { get; }
-            public ExecuteRequest ExecuteRequest { get; }
-            public int ExecutionCount { get; }
-
-            public OpenRequest(JupyterRequestContext context, ExecuteRequest executeRequest, int executionCount, Dictionary<string, object> transient)
-            {
-                Context = context;
-                ExecuteRequest = executeRequest;
-                ExecutionCount = executionCount;
-                Transient = transient;
-            }
-
-            public void AddDisposable(IDisposable disposable)
-            {
-               _disposables.Add(disposable);
-            }
-
-            public void Dispose()
-            {
-                _disposables.Dispose();
-            }
-        }
-
-        public ExecuteRequestHandler(IKernel kernel)
-        {
-            _kernel = kernel;
             _renderingEngine = new RenderingEngine(new DefaultRenderer(), new PlainTextRendering("<null>"));
             _renderingEngine.RegisterRenderer(typeof(string), new DefaultRenderer());
             _renderingEngine.RegisterRenderer(typeof(IDictionary), new DictionaryRenderer());
@@ -70,16 +41,16 @@ public async Task Handle(JupyterRequestContext context)
             var transient = new Dictionary<string, object> { { "display_id", id.ToString() } };
             var openRequest = new OpenRequest(context, executeRequest, executionCount, transient);
 
-            _openRequests[command] = openRequest;
+            OpenRequests[command] = openRequest;
 
             try
             {
-                var kernelResult = await _kernel.SendAsync(command);
+                var kernelResult = await Kernel.SendAsync(command);
                 openRequest.AddDisposable(kernelResult.KernelEvents.Subscribe(OnKernelResultEvent));
             }
             catch (Exception e)
             {
-                _openRequests.TryRemove(command, out _);
+                OpenRequests.TryRemove(command, out _);
 
                 var errorContent = new Error(
                     eName: "Unhandled Exception",
@@ -120,13 +91,13 @@ void OnKernelResultEvent(IKernelEvent value)
             switch (value)
             {
                 case ValueProduced valueProduced:
-                    OnValueProduced(valueProduced, _openRequests, _renderingEngine);
+                    OnValueProduced(valueProduced, OpenRequests, _renderingEngine);
                     break;
                 case CodeSubmissionEvaluated codeSubmissionEvaluated:
-                    OnCodeSubmissionEvaluated(codeSubmissionEvaluated, _openRequests);
+                    OnCodeSubmissionEvaluated(codeSubmissionEvaluated, OpenRequests);
                     break;
                 case CodeSubmissionEvaluationFailed codeSubmissionEvaluationFailed:
-                    OnCodeSubmissionEvaluatedFailed(codeSubmissionEvaluationFailed, _openRequests);
+                    OnCodeSubmissionEvaluatedFailed(codeSubmissionEvaluationFailed, OpenRequests);
                     break;
                 case CodeSubmissionReceived _:
                 case IncompleteCodeSubmissionReceived _:
@@ -146,7 +117,7 @@ private static void OnCodeSubmissionEvaluatedFailed(CodeSubmissionEvaluationFail
                 eValue: $"{codeSubmissionEvaluationFailed.Message}"
             );
 
-            if (!openRequest.ExecuteRequest.Silent)
+            if (!openRequest.Request.Silent)
             {
                 // send on io
                 var error = Message.Create(
@@ -198,7 +169,7 @@ private static void OnValueProduced(ValueProduced valueProduced,
                         { rendering.MimeType, rendering.Content }
                     });
 
-                if (!openRequest.ExecuteRequest.Silent)
+                if (!openRequest.Request.Silent)
                 {
                     // send on io
                     var executeResultMessage = Message.Create(
@@ -214,7 +185,7 @@ private static void OnValueProduced(ValueProduced valueProduced,
                     eValue: $"{e.Message}"
                 );
 
-                if (!openRequest.ExecuteRequest.Silent)
+                if (!openRequest.Request.Silent)
                 {
                     // send on io
                     var error = Message.Create(
diff --git a/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs b/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs
new file mode 100644
index 000000000..3ae2c531f
--- /dev/null
+++ b/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs
@@ -0,0 +1,61 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reactive.Disposables;
+using Microsoft.DotNet.Try.Jupyter.Protocol;
+using WorkspaceServer.Kernel;
+
+namespace Microsoft.DotNet.Try.Jupyter
+{
+    public abstract class RequestHandlerBase<T> : IDisposable
+        where T : JupyterMessageContent
+    {
+        private readonly CompositeDisposable _disposables = new CompositeDisposable();
+
+        protected RequestHandlerBase(IKernel kernel)
+        {
+            Kernel = kernel ?? throw new ArgumentNullException(nameof(kernel));
+        }
+
+        protected IKernel Kernel { get;  }
+
+        protected ConcurrentDictionary<IKernelCommand, OpenRequest> OpenRequests { get; } = new ConcurrentDictionary<IKernelCommand, OpenRequest>();
+
+        public void Dispose()
+        {
+            _disposables.Dispose();
+        }
+
+        protected class OpenRequest : IDisposable
+        {
+            private readonly CompositeDisposable _disposables = new CompositeDisposable();
+            public Dictionary<string, object> Transient { get; }
+            public JupyterRequestContext Context { get; }
+            public T Request { get; }
+            public int ExecutionCount { get; }
+
+            public OpenRequest(JupyterRequestContext context, T request, int executionCount,
+                Dictionary<string, object> transient)
+            {
+                Context = context;
+                Request = request;
+                ExecutionCount = executionCount;
+                Transient = transient;
+            }
+
+            public void AddDisposable(IDisposable disposable)
+            {
+                _disposables.Add(disposable);
+            }
+            public void Dispose()
+            {
+                _disposables.Dispose();
+            }
+        }
+    
+       
+    }
+}
\ No newline at end of file

From 0d7b11ada09f5fa25d37cb4515f2f93b5502be7b Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Mon, 15 Jul 2019 22:03:55 +0100
Subject: [PATCH 06/18] refactor common code

---
 .../CompleteRequestHandlerTests.cs             |  4 ++--
 .../CompleteRequestHandler.cs                  | 18 ++++++------------
 .../ExecuteRequestHandler.cs                   |  3 ++-
 .../RequestHandlerBase.cs                      |  8 ++++++++
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs b/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs
index 418dede9b..ee2873563 100644
--- a/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs
+++ b/Microsoft.DotNet.Try.Jupyter.Tests/CompleteRequestHandlerTests.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Try.Jupyter.Tests
 {
-    public class CompleteRequestHandlerTests
+    public class CompleteRequestHandlerTests 
     {
         private readonly MessageSender _ioPubChannel;
         private readonly MessageSender _serverChannel;
@@ -32,7 +32,7 @@ public CompleteRequestHandlerTests()
         public void cannot_handle_requests_that_are_not_executeRequest()
         {
             var kernel = new CSharpRepl();
-            var handler = new ExecuteRequestHandler(kernel);
+            var handler = new CompleteRequestHandler(kernel);
             var request = Message.Create(new DisplayData(), null);
             Func<Task> messageHandling = () => handler.Handle(new JupyterRequestContext(_serverChannel, _ioPubChannel, request, _kernelStatus));
             messageHandling.Should().ThrowExactly<InvalidOperationException>();
diff --git a/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs
index b0b9610fb..3685fd5cc 100644
--- a/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/CompleteRequestHandler.cs
@@ -9,30 +9,24 @@
 
 namespace Microsoft.DotNet.Try.Jupyter
 {
-    public class CompleteRequestHandler : IDisposable
+    public class CompleteRequestHandler: RequestHandlerBase<CompleteRequest>
     {
-        private readonly CompositeDisposable _disposables = new CompositeDisposable();
-        private readonly IKernel _kernel;
+   
 
-        public CompleteRequestHandler(IKernel kernel)
+        public CompleteRequestHandler(IKernel kernel) : base(kernel)
         {
-            _kernel = kernel;
+            
         }
 
         public Task Handle(JupyterRequestContext context)
         {
-            var completeRequest = context.GetRequestContent<CompleteRequest>() ??
-                                 throw new InvalidOperationException(
-                                     $"Request Content must be a not null {typeof(CompleteRequest).Name}");
+            var completeRequest = GetRequest(context);
 
             context.RequestHandlerStatus.SetAsBusy();
             context.RequestHandlerStatus.SetAsIdle();
             throw new NotImplementedException();
         }
 
-        public void Dispose()
-        {
-            _disposables.Dispose();
-        }
+      
     }
 }
\ No newline at end of file
diff --git a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
index 22bb4b650..06d7e5c4c 100644
--- a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
@@ -32,7 +32,8 @@ public ExecuteRequestHandler(IKernel kernel) :base(kernel)
 
         public async Task Handle(JupyterRequestContext context)
         {
-            var executeRequest = context.GetRequestContent<ExecuteRequest>() ?? throw new InvalidOperationException($"Request Content must be a not null {typeof(ExecuteRequest).Name}");
+            var executeRequest = GetRequest(context);
+
             context.RequestHandlerStatus.SetAsBusy();
             var executionCount = executeRequest.Silent ? _executionCount : Interlocked.Increment(ref _executionCount);
 
diff --git a/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs b/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs
index 3ae2c531f..f5e7873b8 100644
--- a/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs
+++ b/Microsoft.DotNet.Try.Jupyter/RequestHandlerBase.cs
@@ -20,6 +20,14 @@ protected RequestHandlerBase(IKernel kernel)
             Kernel = kernel ?? throw new ArgumentNullException(nameof(kernel));
         }
 
+        protected static T GetRequest(JupyterRequestContext context)
+        {
+            var request = context.GetRequestContent<T>() ??
+                                  throw new InvalidOperationException(
+                                      $"Request Content must be a not null {typeof(T).Name}");
+            return request;
+        }
+
         protected IKernel Kernel { get;  }
 
         protected ConcurrentDictionary<IKernelCommand, OpenRequest> OpenRequests { get; } = new ConcurrentDictionary<IKernelCommand, OpenRequest>();

From 7227240467967d0e0905b6be8bfd847e34f92d4e Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 01:28:53 +0100
Subject: [PATCH 07/18] handle version and assembly name separately

---
 MLS.Agent/CommandLine/PackCommand.cs          |  4 +--
 MLS.Agent/Startup.cs                          |  5 +++-
 .../BlazorPackageInitializerTests.cs          |  8 ++---
 WorkspaceServer.Tests/Default.cs              |  2 --
 .../Packaging/BlazorPackageInitializer.cs     | 30 ++++++++++++-------
 WorkspaceServer/Packaging/PackageBuilder.cs   |  4 +--
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/MLS.Agent/CommandLine/PackCommand.cs b/MLS.Agent/CommandLine/PackCommand.cs
index 71d58d32b..aedbc092f 100644
--- a/MLS.Agent/CommandLine/PackCommand.cs
+++ b/MLS.Agent/CommandLine/PackCommand.cs
@@ -31,7 +31,7 @@ public static async Task<string> Do(PackOptions options, IConsole console)
 
                 if (options.EnableWasm)
                 {
-                    string runnerDirectoryName = $"wasm";
+                    string runnerDirectoryName = "wasm";
                     var temp_projects_wasm = temp_projects.CreateSubdirectory(runnerDirectoryName);
                     var temp_mlsblazor = temp.CreateSubdirectory("MLS.Blazor");
                     await AddBlazorProject(temp_mlsblazor, GetProjectFile(temp_projects_build), name, temp_projects_wasm);
@@ -73,7 +73,7 @@ await File.WriteAllTextAsync(
 
         private static async Task AddBlazorProject(DirectoryInfo blazorTargetDirectory, FileInfo projectToReference, string name, DirectoryInfo wasmLocation)
         {
-            var initializer = new BlazorPackageInitializer(name, new System.Collections.Generic.List<string>());
+            var initializer = new BlazorPackageInitializer(name, new System.Collections.Generic.List<(string,string)>());
             await initializer.Initialize(blazorTargetDirectory);
 
             await AddReference(blazorTargetDirectory, projectToReference);
diff --git a/MLS.Agent/Startup.cs b/MLS.Agent/Startup.cs
index 461a1fc26..83e1917f8 100644
--- a/MLS.Agent/Startup.cs
+++ b/MLS.Agent/Startup.cs
@@ -234,7 +234,10 @@ private void LaunchBrowser(IBrowserLauncher browserLauncher, IDirectoryAccessor
 
             RelativeFilePath FindReadmeFileAtRoot()
             {
-                var files = directoryAccessor.GetAllFilesRecursively().Where(f => (StringComparer.InvariantCultureIgnoreCase.Compare(f.FileName, "readme.md") == 0) && IsRoot(f.Directory)).ToList();
+                var files = directoryAccessor
+                    .GetAllFilesRecursively()
+                    .Where(f => (StringComparer.InvariantCultureIgnoreCase.Compare(f.FileName, "readme.md") == 0) && IsRoot(f.Directory))
+                    .ToList();
 
                 return files.FirstOrDefault();
             }
diff --git a/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs b/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs
index 1ffceace3..9d5896ec5 100644
--- a/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs
+++ b/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs
@@ -22,7 +22,7 @@ public void WORKAROUND_Requires_MLS_Blazor_directory_because_of_aspnet_AspNetCor
 
             var initializer = new BlazorPackageInitializer(
                 "blazor-test",
-                new List<string>());
+                new List<(string,string)>());
 
             Func<Task> initialize = async () =>
                 await initializer.Initialize(empty.Directory);
@@ -40,7 +40,7 @@ public async Task Initializes_project_with_right_files()
             var name = "blazor-test";
             var initializer = new BlazorPackageInitializer(
                 name,
-                new List<string>());
+                new List<(string, string)>());
 
             await initializer.Initialize(dir);
 
@@ -73,9 +73,9 @@ public async Task Adds_packages()
             var name = "blazor-test";
             var initializer = new BlazorPackageInitializer(
                 name,
-                new List<string>()
+                new List<(string, string)>
                 {
-                    "Microsoft.Extensions.Logging::3.0.0-preview6.19304.6"
+                    ("Microsoft.Extensions.Logging", "3.0.0-preview6.19304.6")
                 });
 
             await initializer.Initialize(dir);
diff --git a/WorkspaceServer.Tests/Default.cs b/WorkspaceServer.Tests/Default.cs
index ee379bbb3..038059219 100644
--- a/WorkspaceServer.Tests/Default.cs
+++ b/WorkspaceServer.Tests/Default.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
 using System.CommandLine;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Clockwise;
diff --git a/WorkspaceServer/Packaging/BlazorPackageInitializer.cs b/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
index 56c825964..6d6538a16 100644
--- a/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
+++ b/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
@@ -14,20 +14,24 @@ namespace WorkspaceServer.Packaging
     public class BlazorPackageInitializer : PackageInitializer
     {
         private readonly string _name;
-        private readonly List<string> _addPackages;
+        private readonly List<(string packageName, string packageVersion)> _addPackages;
 
-        public BlazorPackageInitializer(string name, List<string> addPackages) :
+        public BlazorPackageInitializer(string name, List<(string packageName, string packageVersion)> addPackages) :
             base("blazor", "MLS.Blazor")
         {
             _name = name;
-            _addPackages = addPackages ?? throw new ArgumentNullException(nameof(addPackages));
+            var packages = addPackages ?? throw new ArgumentNullException(nameof(addPackages));
 
-            var requiredPackages = new List<string>
+            var requiredPackages = new List<(string packageName, string packageVersion)>
             {
-                "Newtonsoft.Json"
+                ("Newtonsoft.Json", "12.0.02"),
+                ("system.commandline.experimental", "0.3.0-alpha.19317.1"),
+                ("Microsoft.AspNetCore.Blazor", "3.0.0-preview6.19307.2"),
+                ("Microsoft.AspNetCore.Blazor.Build", "3.0.0-preview6.19307.2"),
+                ("Microsoft.AspNetCore.Blazor.DevServer", "3.0.0-preview6.19307.2")
             };
 
-            _addPackages = addPackages.Concat(requiredPackages).Distinct().ToList();
+            _addPackages = packages.Concat(requiredPackages).Distinct().ToList();
         }
 
         public override async Task Initialize(DirectoryInfo directory, Budget budget = null)
@@ -53,10 +57,14 @@ private async Task MakeBlazorProject(DirectoryInfo directory, Budget budget)
             
             foreach (var packageId in _addPackages)
             {
-                await dotnet.AddPackage(packageId);
-            }
+                var addPackageResult = await dotnet.AddPackage(packageId.packageName, packageId.packageVersion);
+                var addPackageResultMessage = string.Concat(
+                    string.Join("\n", addPackageResult.Output), 
+                    string.Join("\n", addPackageResult.Error));
 
-            await dotnet.AddPackage("System.CommandLine.Experimental", "0.3.0-alpha.19317.1");
+                addPackageResult.ThrowOnFailure(addPackageResultMessage);
+            }
+           
 
             var result = await dotnet.Build("-o runtime /bl", budget: budget);
             var stuff = string.Concat(string.Join("\n", result.Output), (string.Join("\n", result.Error)));
@@ -113,8 +121,8 @@ private void WriteResourcesToLocation(string[] resources, string targetDirectory
 
         private void WriteResource(string resourceName, string targetDirectory)
         {
-            var text = this.GetType().ReadManifestResource($"WorkspaceServer.{resourceName}");
-            System.IO.Directory.CreateDirectory(targetDirectory);
+            var text = GetType().ReadManifestResource($"WorkspaceServer.{resourceName}");
+            Directory.CreateDirectory(targetDirectory);
             var path = Path.Combine(targetDirectory, resourceName);
             File.WriteAllText(path, text);
         }
diff --git a/WorkspaceServer/Packaging/PackageBuilder.cs b/WorkspaceServer/Packaging/PackageBuilder.cs
index c85226e91..251988226 100644
--- a/WorkspaceServer/Packaging/PackageBuilder.cs
+++ b/WorkspaceServer/Packaging/PackageBuilder.cs
@@ -13,7 +13,7 @@ public class PackageBuilder
     {
         private PackageBase _packageBase;
         private readonly List<Func<PackageBase, Budget, Task>> _afterCreateActions = new List<Func<PackageBase, Budget, Task>>();
-        private readonly List<string> _addPackages = new List<string>();
+        private readonly List<(string packageName, string packageVersion)> _addPackages = new List<(string packageName, string packageVersion)>();
         private string _languageVersion = "8.0";
 
         public PackageBuilder(string packageName, IPackageInitializer packageInitializer = null)
@@ -48,7 +48,7 @@ public void CreateUsingDotnet(string template, string projectName = null, string
 
         public void AddPackageReference(string packageId, string version = null)
         {
-            _addPackages.Add(packageId);
+            _addPackages.Add((packageId, version));
             _afterCreateActions.Add(async (package, budget) =>
             {
                 Func<Task> action = async () =>

From 28367a74c301f03b6aa91f19ceac6103dcc1ebcd Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 09:14:40 +0100
Subject: [PATCH 08/18] remove blazor packages

---
 WorkspaceServer/Packaging/BlazorPackageInitializer.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/WorkspaceServer/Packaging/BlazorPackageInitializer.cs b/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
index 6d6538a16..28347598e 100644
--- a/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
+++ b/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
@@ -25,10 +25,7 @@ public BlazorPackageInitializer(string name, List<(string packageName, string pa
             var requiredPackages = new List<(string packageName, string packageVersion)>
             {
                 ("Newtonsoft.Json", "12.0.02"),
-                ("system.commandline.experimental", "0.3.0-alpha.19317.1"),
-                ("Microsoft.AspNetCore.Blazor", "3.0.0-preview6.19307.2"),
-                ("Microsoft.AspNetCore.Blazor.Build", "3.0.0-preview6.19307.2"),
-                ("Microsoft.AspNetCore.Blazor.DevServer", "3.0.0-preview6.19307.2")
+                ("system.commandline.experimental", "0.3.0-alpha.19317.1")               
             };
 
             _addPackages = packages.Concat(requiredPackages).Distinct().ToList();

From fc777e319eecbfcae66238caa34b78a22a031358 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 09:22:47 +0100
Subject: [PATCH 09/18] rebase

---
 MLS.Agent/CommandLine/CommandLineParser.cs    | 76 +++++++++----------
 .../ExecuteRequestHandler.cs                  |  8 --
 .../JupyterRequestContextHandler.cs           |  1 -
 3 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/MLS.Agent/CommandLine/CommandLineParser.cs b/MLS.Agent/CommandLine/CommandLineParser.cs
index d83930abf..718b97f34 100644
--- a/MLS.Agent/CommandLine/CommandLineParser.cs
+++ b/MLS.Agent/CommandLine/CommandLineParser.cs
@@ -57,7 +57,7 @@ public delegate Task<int> Jupyter(
             InvocationContext context = null);
 
         public static Parser Create(
-            IServiceCollection services, 
+            IServiceCollection services,
             StartServer startServer = null,
             Demo demo = null,
             TryGitHub tryGithub = null,
@@ -100,7 +100,7 @@ public static Parser Create(
 
             install = install ??
              InstallCommand.Do;
-        
+
 
             var dirArgument = new Argument<DirectoryInfo>
             {
@@ -146,63 +146,63 @@ RootCommand StartInTryMode()
                 command.AddOption(new Option(
                                       "--add-package-source",
                                       "Specify an additional NuGet package source")
-                                  {
-                                      Argument = new Argument<PackageSource>(() => new PackageSource(Directory.GetCurrentDirectory()))
-                                      {
-                                          Name = "NuGet source"
-                                      }
-                                  });
+                {
+                    Argument = new Argument<PackageSource>(() => new PackageSource(Directory.GetCurrentDirectory()))
+                    {
+                        Name = "NuGet source"
+                    }
+                });
 
                 command.AddOption(new Option(
                                       "--package",
                                       "Specify a Try .NET package or path to a .csproj to run code samples with")
-                                  {
-                                      Argument = new Argument<string>
-                                      {
-                                          Name = "name or .csproj"
-                                      }
-                                  });
+                {
+                    Argument = new Argument<string>
+                    {
+                        Name = "name or .csproj"
+                    }
+                });
 
                 command.AddOption(new Option(
                                       "--package-version",
                                       "Specify a Try .NET package version to use with the --package option")
-                                  {
-                                      Argument = new Argument<string>
-                                      {
-                                          Name = "version"
-                                      }
-                                  });
+                {
+                    Argument = new Argument<string>
+                    {
+                        Name = "version"
+                    }
+                });
 
                 command.AddOption(new Option(
                                       "--uri",
                                       "Specify a URL or a relative path to a Markdown file")
-                                  {
-                                      Argument = new Argument<Uri>()
-                                  });
+                {
+                    Argument = new Argument<Uri>()
+                });
 
                 command.AddOption(new Option(
                                           "--enable-preview-features",
                                           "Enable preview features")
-                                  {
-                                      Argument = new Argument<bool>()
-                                  });
+                {
+                    Argument = new Argument<bool>()
+                });
 
                 command.AddOption(new Option(
                                       "--log-path",
                                       "Enable file logging to the specified directory")
-                                  {
-                                      Argument = new Argument<DirectoryInfo>
-                                      {
-                                          Name = "dir"
-                                      }
-                                  });
+                {
+                    Argument = new Argument<DirectoryInfo>
+                    {
+                        Name = "dir"
+                    }
+                });
 
                 command.AddOption(new Option(
                                           "--verbose",
                                           "Enable verbose logging to the console")
-                                  {
-                                      Argument = new Argument<bool>()
-                                  });
+                {
+                    Argument = new Argument<bool>()
+                });
 
                 var portArgument = new Argument<ushort>();
 
@@ -221,9 +221,9 @@ RootCommand StartInTryMode()
                 command.AddOption(new Option(
                                         "--port",
                                         "Specify the port for dotnet try to listen on")
-                                  {
-                                      Argument = portArgument
-                                  });
+                {
+                    Argument = portArgument
+                });
 
                 command.Handler = CommandHandler.Create<InvocationContext, StartupOptions>((context, options) =>
                 {
diff --git a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
index 06d7e5c4c..e79109e37 100644
--- a/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/ExecuteRequestHandler.cs
@@ -5,7 +5,6 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.DotNet.Try.Jupyter.Protocol;
@@ -18,8 +17,6 @@ public class ExecuteRequestHandler : RequestHandlerBase<ExecuteRequest>
     {
         private readonly RenderingEngine _renderingEngine;
         private int _executionCount;
-        private readonly  CompositeDisposable _disposables = new CompositeDisposable();
-
       
         public ExecuteRequestHandler(IKernel kernel) :base(kernel)
         {
@@ -220,10 +217,5 @@ private static void OnCodeSubmissionEvaluated(CodeSubmissionEvaluated codeSubmis
             openRequest.Context.RequestHandlerStatus.SetAsIdle();
             openRequest.Dispose();
         }
-
-        public void Dispose()
-        {
-            _disposables.Dispose();
-        }
     }
 }
\ No newline at end of file
diff --git a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
index 801792943..d42ba1b75 100644
--- a/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
+++ b/Microsoft.DotNet.Try.Jupyter/JupyterRequestContextHandler.cs
@@ -27,7 +27,6 @@ public JupyterRequestContextHandler(
             PackageRegistry packageRegistry,
             IKernel kernel)
         {
-            var kernel = new CSharpRepl();
             _executeHandler = new ExecuteRequestHandler(kernel);
             _completeHandler = new CompleteRequestHandler(kernel);
 

From 60e014aaa6d83645aa1061e23a3b0fe3c0e23112 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 12:56:34 +0100
Subject: [PATCH 10/18] use /WeatherForecast as that is what the template
 generates

---
 WorkspaceServer.Tests/AspNetWorkspaceTests.cs  | 2 +-
 WorkspaceServer.Tests/WebServerTests.cs        | 8 ++------
 WorkspaceServer/WorkspaceFeatures/WebServer.cs | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
index d9c3af752..dbd93c683 100644
--- a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
+++ b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
@@ -47,7 +47,7 @@ public async Task Run_starts_the_kestrel_server_and_provides_a_WebServer_feature
             {
                 var webServer = runResult.GetFeature<WebServer>();
 
-                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values")).CancelIfExceeds(new TimeBudget(35.Seconds()));
+                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast")).CancelIfExceeds(new TimeBudget(35.Seconds()));
 
                 var result = await response.EnsureSuccess()
                                            .DeserializeAs<string[]>();
diff --git a/WorkspaceServer.Tests/WebServerTests.cs b/WorkspaceServer.Tests/WebServerTests.cs
index 5c10dd74d..163ad5437 100644
--- a/WorkspaceServer.Tests/WebServerTests.cs
+++ b/WorkspaceServer.Tests/WebServerTests.cs
@@ -2,17 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Clockwise;
 using FluentAssertions;
-using FluentAssertions.Extensions;
 using Pocket;
 using Recipes;
 using WorkspaceServer.Features;
-using WorkspaceServer.Packaging;
 using WorkspaceServer.Tests.Packaging;
 using Xunit;
 using Xunit.Abstractions;
@@ -37,8 +33,8 @@ public async Task Multiple_WebServer_instances_can_be_run_concurrently_in_the_sa
             using (var webServer1 = new WebServer(workspace))
             using (var webServer2 = new WebServer(workspace))
             {
-                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
-                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
+                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast"));
+                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast"));
 
                 response1.EnsureSuccess();
                 response2.EnsureSuccess();
diff --git a/WorkspaceServer/WorkspaceFeatures/WebServer.cs b/WorkspaceServer/WorkspaceFeatures/WebServer.cs
index e31f0aebb..42b3bef84 100644
--- a/WorkspaceServer/WorkspaceFeatures/WebServer.cs
+++ b/WorkspaceServer/WorkspaceFeatures/WebServer.cs
@@ -51,7 +51,7 @@ private async Task<Uri> RunKestrel()
                 StandardOutput.OnNext,
                 StandardError.OnNext,
                 ("ASPNETCORE_DETAILEDERRORS", "1"),
-                ("ASPNETCORE_URLS", $"http://127.0.0.1:0"),
+                ("ASPNETCORE_URLS", "http://127.0.0.1:0"),
                 ("ASPNETCORE_PORT", null));
 
             _disposables.Add(() =>

From e6df156e0dea70a10e7a1b015501f9570e135713 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 15:45:17 +0100
Subject: [PATCH 11/18] fix template issue in asp.net webapi project with
 preview 7

---
 MLS.Agent.Tools/AsyncLazy{T}.cs               |  6 +++---
 WorkspaceServer.Tests/AspNetWorkspaceTests.cs |  2 +-
 WorkspaceServer.Tests/Default.cs              | 20 +++++++++++++++++++
 WorkspaceServer.Tests/WebServerTests.cs       |  4 ++--
 WorkspaceServer/Packaging/PackageBuilder.cs   | 10 ++++++++++
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/MLS.Agent.Tools/AsyncLazy{T}.cs b/MLS.Agent.Tools/AsyncLazy{T}.cs
index b3e819b14..3305aa446 100644
--- a/MLS.Agent.Tools/AsyncLazy{T}.cs
+++ b/MLS.Agent.Tools/AsyncLazy{T}.cs
@@ -8,7 +8,7 @@ namespace MLS.Agent.Tools
 {
     public class AsyncLazy<T>
     {
-        private readonly Lazy<Task<T>> lazy;
+        private readonly Lazy<Task<T>> _lazy;
 
         public AsyncLazy(Func<Task<T>> initialize)
         {
@@ -17,9 +17,9 @@ public AsyncLazy(Func<Task<T>> initialize)
                 throw new ArgumentNullException(nameof(initialize));
             }
 
-            lazy = new Lazy<Task<T>>(initialize);
+            _lazy = new Lazy<Task<T>>(initialize);
         }
 
-        public Task<T> ValueAsync() => lazy.Value;
+        public Task<T> ValueAsync() => _lazy.Value;
     }
 }
diff --git a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
index dbd93c683..d9c3af752 100644
--- a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
+++ b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
@@ -47,7 +47,7 @@ public async Task Run_starts_the_kestrel_server_and_provides_a_WebServer_feature
             {
                 var webServer = runResult.GetFeature<WebServer>();
 
-                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast")).CancelIfExceeds(new TimeBudget(35.Seconds()));
+                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values")).CancelIfExceeds(new TimeBudget(35.Seconds()));
 
                 var result = await response.EnsureSuccess()
                                            .DeserializeAs<string[]>();
diff --git a/WorkspaceServer.Tests/Default.cs b/WorkspaceServer.Tests/Default.cs
index 038059219..4bb3f3fc8 100644
--- a/WorkspaceServer.Tests/Default.cs
+++ b/WorkspaceServer.Tests/Default.cs
@@ -56,6 +56,26 @@ public class Default
         {
             var packageBuilder = new PackageBuilder("aspnet.webapi");
             packageBuilder.CreateUsingDotnet("webapi");
+            packageBuilder.DeleteFile("WeatherForecast.cs");
+            packageBuilder.DeleteFile("Controllers/WeatherForecastController.cs");
+            packageBuilder.WriteFile("Controllers/ApiController.cs", @"using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+
+namespace aspnet.webapi.Controllers
+{
+    [ApiController]
+    [Route(""[controller]"")]
+    public class ApiController : ControllerBase
+    {
+        public ApiController() { }
+
+        [HttpGet(""values"")]
+        public IEnumerable<string> Values()
+        {
+            return new[] { ""value1"", ""value2"" };
+        }
+    }
+}");
             packageBuilder.TrySetLanguageVersion("8.0");
             var package = packageBuilder.GetPackage() as Package;
             await package.CreateRoslynWorkspaceForRunAsync(new Budget());
diff --git a/WorkspaceServer.Tests/WebServerTests.cs b/WorkspaceServer.Tests/WebServerTests.cs
index 163ad5437..67ed025d9 100644
--- a/WorkspaceServer.Tests/WebServerTests.cs
+++ b/WorkspaceServer.Tests/WebServerTests.cs
@@ -33,8 +33,8 @@ public async Task Multiple_WebServer_instances_can_be_run_concurrently_in_the_sa
             using (var webServer1 = new WebServer(workspace))
             using (var webServer2 = new WebServer(workspace))
             {
-                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast"));
-                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/WeatherForecast"));
+                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
+                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
 
                 response1.EnsureSuccess();
                 response2.EnsureSuccess();
diff --git a/WorkspaceServer/Packaging/PackageBuilder.cs b/WorkspaceServer/Packaging/PackageBuilder.cs
index 251988226..06a80813f 100644
--- a/WorkspaceServer/Packaging/PackageBuilder.cs
+++ b/WorkspaceServer/Packaging/PackageBuilder.cs
@@ -131,6 +131,16 @@ public void DeleteFile(string relativePath)
             });
         }
 
+        public void WriteFile(string relativePath, string content)
+        {
+            _afterCreateActions.Add(async (workspace, budget) =>
+            {
+                await Task.Yield();
+                var filePath = Path.Combine(workspace.Directory.FullName, relativePath);
+                File.WriteAllText(filePath,content);
+            });
+        }
+
         public PackageBase GetPackage(Budget budget = null)
         {
             budget = budget ?? new Budget();

From 824e9281375cb2dd4a0e5fa3a5c7feeaabeaab4c Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 15:47:08 +0100
Subject: [PATCH 12/18] delete file only if exists

---
 WorkspaceServer/Packaging/PackageBuilder.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WorkspaceServer/Packaging/PackageBuilder.cs b/WorkspaceServer/Packaging/PackageBuilder.cs
index 06a80813f..7293f1b28 100644
--- a/WorkspaceServer/Packaging/PackageBuilder.cs
+++ b/WorkspaceServer/Packaging/PackageBuilder.cs
@@ -127,7 +127,10 @@ public void DeleteFile(string relativePath)
             {
                 await Task.Yield();
                 var filePath = Path.Combine(workspace.Directory.FullName, relativePath);
-                File.Delete(filePath);
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
             });
         }
 

From 7be703dbd15651216dd2f7ade01957cdf2a875d8 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 15:51:46 +0100
Subject: [PATCH 13/18] vulnerability issues

---
 Microsoft.DotNet.Try.Client/package-lock.json | 151 ++++--------------
 Microsoft.DotNet.Try.Client/package.json      |   4 +-
 2 files changed, 31 insertions(+), 124 deletions(-)

diff --git a/Microsoft.DotNet.Try.Client/package-lock.json b/Microsoft.DotNet.Try.Client/package-lock.json
index ae6558cdc..b8202479a 100644
--- a/Microsoft.DotNet.Try.Client/package-lock.json
+++ b/Microsoft.DotNet.Try.Client/package-lock.json
@@ -6148,9 +6148,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
     "lodash-es": {
@@ -6443,9 +6443,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -6454,8 +6454,8 @@
       "dependencies": {
         "is-extendable": {
           "version": "1.0.1",
-          "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -6718,72 +6718,13 @@
       }
     },
     "mocha-trx-reporter": {
-      "version": "3.2.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/mocha-trx-reporter/-/mocha-trx-reporter-3.2.0.tgz",
-      "integrity": "sha1-9cmNu3INjEGAHJw3+JoW13XfW0E=",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mocha-trx-reporter/-/mocha-trx-reporter-3.2.3.tgz",
+      "integrity": "sha512-UYgc72sjmGK/ztXlECE6ptiPcSSPuwYsspJF0wQELQvVETRmOrs9a2cu6sjSsjbuoddnVxz7znfhJczyoKULzA==",
       "dev": true,
       "requires": {
-        "mocha": "^5.0.0",
-        "node-trx": "^0.8.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "he": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-          "dev": true
-        },
-        "mocha": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-          "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-          "dev": true,
-          "requires": {
-            "browser-stdout": "1.3.1",
-            "commander": "2.15.1",
-            "debug": "3.1.0",
-            "diff": "3.5.0",
-            "escape-string-regexp": "1.0.5",
-            "glob": "7.1.2",
-            "growl": "1.10.5",
-            "he": "1.1.1",
-            "minimatch": "3.0.4",
-            "mkdirp": "0.5.1",
-            "supports-color": "5.4.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "mocha": "^6.0.0",
+        "node-trx": "^0.9.0"
       }
     },
     "mocha-typescript": {
@@ -7275,13 +7216,13 @@
       }
     },
     "node-trx": {
-      "version": "0.8.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/node-trx/-/node-trx-0.8.0.tgz",
-      "integrity": "sha1-cadaFGOgc5orgMDr9thH4K9aC28=",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-trx/-/node-trx-0.9.0.tgz",
+      "integrity": "sha512-Jq9bgcO3P5AkYhpSh+DfOfbwPmf66Hhr783uGPh9MpqG/nVj0XTlpRq9L231NT809WLa+gnQTbZuTONgKLWYhQ==",
       "dev": true,
       "requires": {
-        "uuid": "^3.0.0",
-        "xmlbuilder": "^2.6.5"
+        "uuid": "^3.3.2",
+        "xmlbuilder": "^13.0.2"
       }
     },
     "nodent-runtime": {
@@ -8956,9 +8897,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -9940,38 +9881,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "unique-filename": {
@@ -10592,21 +10510,10 @@
       "dev": true
     },
     "xmlbuilder": {
-      "version": "2.6.5",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/xmlbuilder/-/xmlbuilder-2.6.5.tgz",
-      "integrity": "sha1-b/etYPty0idk8AehZLd/K/FABSY=",
-      "dev": true,
-      "requires": {
-        "lodash": "^3.5.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
+      "dev": true
     },
     "xmlchars": {
       "version": "1.3.1",
diff --git a/Microsoft.DotNet.Try.Client/package.json b/Microsoft.DotNet.Try.Client/package.json
index c135d86b5..c76acb06c 100644
--- a/Microsoft.DotNet.Try.Client/package.json
+++ b/Microsoft.DotNet.Try.Client/package.json
@@ -88,12 +88,12 @@
     "js-cookie": "2.2.0",
     "jsdom": "12.0.0",
     "jsdom-global": "3.0.2",
-    "lodash": "4.17.11",
+    "lodash": "^4.17.14",
     "mini-css-extract-plugin": "0.4.2",
     "mkdirp": "0.5.1",
     "mocha": "6.1.4",
     "mocha-multi-reporters": "1.1.7",
-    "mocha-trx-reporter": "3.2.0",
+    "mocha-trx-reporter": "^3.2.3",
     "mocha-typescript": "1.1.17",
     "mochapack": "1.1.1",
     "mock-http-server": "1.0.0",

From 08f48197b3fcde9447118394c1281ae5cafdcfce Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 17:16:51 +0100
Subject: [PATCH 14/18] vulnerability checks

---
 Microsoft.DotNet.Try.Client/package.json      |   4 +-
 Microsoft.DotNet.Try.Styles/package-lock.json |   6 +-
 Microsoft.DotNet.Try.Styles/package.json      |   1 +
 Microsoft.DotNet.Try.js/package-lock.json     | 133 ++++--------------
 Microsoft.DotNet.Try.js/package.json          |   4 +-
 5 files changed, 35 insertions(+), 113 deletions(-)

diff --git a/Microsoft.DotNet.Try.Client/package.json b/Microsoft.DotNet.Try.Client/package.json
index c76acb06c..c63dcb3dc 100644
--- a/Microsoft.DotNet.Try.Client/package.json
+++ b/Microsoft.DotNet.Try.Client/package.json
@@ -88,12 +88,12 @@
     "js-cookie": "2.2.0",
     "jsdom": "12.0.0",
     "jsdom-global": "3.0.2",
-    "lodash": "^4.17.14",
+    "lodash": "4.17.14",
     "mini-css-extract-plugin": "0.4.2",
     "mkdirp": "0.5.1",
     "mocha": "6.1.4",
     "mocha-multi-reporters": "1.1.7",
-    "mocha-trx-reporter": "^3.2.3",
+    "mocha-trx-reporter": "3.2.3",
     "mocha-typescript": "1.1.17",
     "mochapack": "1.1.1",
     "mock-http-server": "1.0.0",
diff --git a/Microsoft.DotNet.Try.Styles/package-lock.json b/Microsoft.DotNet.Try.Styles/package-lock.json
index 203b3e5e1..17eddfc9d 100644
--- a/Microsoft.DotNet.Try.Styles/package-lock.json
+++ b/Microsoft.DotNet.Try.Styles/package-lock.json
@@ -662,9 +662,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
     "loud-rejection": {
diff --git a/Microsoft.DotNet.Try.Styles/package.json b/Microsoft.DotNet.Try.Styles/package.json
index 9ef3972e9..a8e8f4dd3 100644
--- a/Microsoft.DotNet.Try.Styles/package.json
+++ b/Microsoft.DotNet.Try.Styles/package.json
@@ -17,6 +17,7 @@
     "@mdi/font": "3.5.95",
     "fstream": "1.0.12",
     "github-markdown-css": "3.0.1",
+    "lodash": "4.17.14",
     "mkdirp": "0.5.1",
     "node-sass": "4.12.0",
     "tar": "4.4.8",
diff --git a/Microsoft.DotNet.Try.js/package-lock.json b/Microsoft.DotNet.Try.js/package-lock.json
index 32e72fbf3..7bc87cbcc 100644
--- a/Microsoft.DotNet.Try.js/package-lock.json
+++ b/Microsoft.DotNet.Try.js/package-lock.json
@@ -3190,9 +3190,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
     "lodash.sortby": {
@@ -3345,9 +3345,9 @@
       "dev": true
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -3662,58 +3662,13 @@
       }
     },
     "mocha-trx-reporter": {
-      "version": "3.2.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/mocha-trx-reporter/-/mocha-trx-reporter-3.2.0.tgz",
-      "integrity": "sha1-9cmNu3INjEGAHJw3+JoW13XfW0E=",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/mocha-trx-reporter/-/mocha-trx-reporter-3.2.3.tgz",
+      "integrity": "sha512-UYgc72sjmGK/ztXlECE6ptiPcSSPuwYsspJF0wQELQvVETRmOrs9a2cu6sjSsjbuoddnVxz7znfhJczyoKULzA==",
       "dev": true,
       "requires": {
-        "mocha": "^5.0.0",
-        "node-trx": "^0.8.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "he": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-          "dev": true
-        },
-        "mocha": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-          "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-          "dev": true,
-          "requires": {
-            "browser-stdout": "1.3.1",
-            "commander": "2.15.1",
-            "debug": "3.1.0",
-            "diff": "3.5.0",
-            "escape-string-regexp": "1.0.5",
-            "glob": "7.1.2",
-            "growl": "1.10.5",
-            "he": "1.1.1",
-            "minimatch": "3.0.4",
-            "mkdirp": "0.5.1",
-            "supports-color": "5.4.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "mocha": "^6.0.0",
+        "node-trx": "^0.9.0"
       }
     },
     "mocha-typescript": {
@@ -3841,13 +3796,13 @@
       }
     },
     "node-trx": {
-      "version": "0.8.0",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/node-trx/-/node-trx-0.8.0.tgz",
-      "integrity": "sha1-cadaFGOgc5orgMDr9thH4K9aC28=",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-trx/-/node-trx-0.9.0.tgz",
+      "integrity": "sha512-Jq9bgcO3P5AkYhpSh+DfOfbwPmf66Hhr783uGPh9MpqG/nVj0XTlpRq9L231NT809WLa+gnQTbZuTONgKLWYhQ==",
       "dev": true,
       "requires": {
-        "uuid": "^3.0.0",
-        "xmlbuilder": "^2.6.5"
+        "uuid": "^3.3.2",
+        "xmlbuilder": "^13.0.2"
       }
     },
     "npm-run-path": {
@@ -5119,9 +5074,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -5837,38 +5792,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "universalify": {
@@ -6106,21 +6038,10 @@
       "dev": true
     },
     "xmlbuilder": {
-      "version": "2.6.5",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/xmlbuilder/-/xmlbuilder-2.6.5.tgz",
-      "integrity": "sha1-b/etYPty0idk8AehZLd/K/FABSY=",
-      "dev": true,
-      "requires": {
-        "lodash": "^3.5.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/MLS/npm/registry/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        }
-      }
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
+      "dev": true
     },
     "xmlchars": {
       "version": "1.3.1",
diff --git a/Microsoft.DotNet.Try.js/package.json b/Microsoft.DotNet.Try.js/package.json
index 05b0f97fd..e6ada684f 100644
--- a/Microsoft.DotNet.Try.js/package.json
+++ b/Microsoft.DotNet.Try.js/package.json
@@ -30,11 +30,11 @@
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "jsdom": "13.2.0",
-    "lodash": "4.17.11",
+    "lodash": "4.17.14",
     "mkdirp": "0.5.1",
     "mocha": "6.1.4",
     "mocha-multi-reporters": "1.1.7",
-    "mocha-trx-reporter": "3.2.0",
+    "mocha-trx-reporter": "3.2.3",
     "mocha-typescript": "1.1.17",
     "rollup": "1.1.2",
     "rollup-plugin-commonjs": "9.2.0",

From e7a61f66fc3a682641e751c4c69231c745471cb7 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 17:23:15 +0100
Subject: [PATCH 15/18] upgrade build sdk to 3.0.100-preview7-012802

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 61dcca5ab..342b161cf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ variables:
   - name: BlazorTemplateVersion
     value: 3.0.0-preview6.19307.2
   - name: DotNetSdkVersion
-    value: 3.0.100-preview6-012264
+    value: 3.0.100-preview7-012802
   - name: TryDotNetPackagesPath
     value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
 

From 4a4e663172e173993bd93b895216de999e997af1 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 17:25:23 +0100
Subject: [PATCH 16/18] use npm ci instead of npm i

---
 MLS.Agent/MLS.Agent.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MLS.Agent/MLS.Agent.csproj b/MLS.Agent/MLS.Agent.csproj
index 8731528c6..bf3bdbf99 100644
--- a/MLS.Agent/MLS.Agent.csproj
+++ b/MLS.Agent/MLS.Agent.csproj
@@ -155,7 +155,7 @@
     </PropertyGroup>
 
     <Exec Command="npm rebuild node-sass" WorkingDirectory="$(CssInputDir)" />
-    <Exec Command="npm i" WorkingDirectory="$(CssInputDir)" />
+    <Exec Command="npm ci" WorkingDirectory="$(CssInputDir)" />
     <Exec Command="npm run ciCreateDir -- $(CssOutputDir)" WorkingDirectory="$(CssInputDir)" />
     <Exec Command="npm run release -- $(CssOutputFile)" WorkingDirectory="$(CssInputDir)" />
 
@@ -172,7 +172,7 @@
       <_TryDotNetMinJsExists Condition="Exists('$(TryDotNetJsFile)')">true</_TryDotNetMinJsExists>
     </PropertyGroup>
 
-    <Exec Command="npm i" WorkingDirectory="$(TryDotNetJsInputDir)" />
+    <Exec Command="npm ci" WorkingDirectory="$(TryDotNetJsInputDir)" />
     <Exec Command="npm run ciCreateDir -- $(TryDotNetJsOutputDir)" WorkingDirectory="$(TryDotNetJsInputDir)" />
     <Exec Command="npm run build" WorkingDirectory="$(TryDotNetJsInputDir)" />
     <Exec Command="npm run ciMinify -- --output $(TryDotNetJsFile)" WorkingDirectory="$(TryDotNetJsInputDir)" />
@@ -191,7 +191,7 @@
       <_TryDotNetClientExists Condition="Exists('$(ClientOutputFile)')">true</_TryDotNetClientExists>
     </PropertyGroup>
 
-    <Exec Command="npm i" WorkingDirectory="$(ClientInputDir)" />
+    <Exec Command="npm ci" WorkingDirectory="$(ClientInputDir)" />
     <Exec Command="npm run ciCreateDir -- $(ClientOutputDir)" WorkingDirectory="$(ClientInputDir)" />
     <Exec Command="npm run buildCi -- --output-path $(ClientOutputDir)" WorkingDirectory="$(ClientInputDir)" />
 

From 213af08e3256ade479eee8fe984d70e48655b1b0 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 17:36:12 +0100
Subject: [PATCH 17/18] revert sdk

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 342b161cf..61dcca5ab 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ variables:
   - name: BlazorTemplateVersion
     value: 3.0.0-preview6.19307.2
   - name: DotNetSdkVersion
-    value: 3.0.100-preview7-012802
+    value: 3.0.100-preview6-012264
   - name: TryDotNetPackagesPath
     value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
 

From 3d285b358ba09f61fb05948e7ec65f1876357d60 Mon Sep 17 00:00:00 2001
From: Diego <dicolomb@microsoft.com>
Date: Tue, 16 Jul 2019 18:37:24 +0100
Subject: [PATCH 18/18] fix api calls in webapi tests

---
 MLS.Agent.Tests/ApiViaHttpTests.cs            | 6 +++---
 WorkspaceServer.Tests/AspNetWorkspaceTests.cs | 4 +---
 WorkspaceServer.Tests/Default.cs              | 8 +++-----
 WorkspaceServer.Tests/WebServerTests.cs       | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/MLS.Agent.Tests/ApiViaHttpTests.cs b/MLS.Agent.Tests/ApiViaHttpTests.cs
index 2a9fe48d3..71def98ba 100644
--- a/MLS.Agent.Tests/ApiViaHttpTests.cs
+++ b/MLS.Agent.Tests/ApiViaHttpTests.cs
@@ -633,7 +633,7 @@ public static IEnumerable<int> Fibonacci()
         public async Task When_aspnet_webapi_workspace_request_succeeds_then_output_shows_web_response()
         {
             var workspace = new Workspace(workspaceType: "aspnet.webapi", buffers: new[] { new Buffer("empty.cs", "") });
-            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/api/values", "get"), requestId: "TestRun");
+            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/custom/values", "get"), requestId: "TestRun");
 
             var json = request.ToJson();
 
@@ -667,7 +667,7 @@ public async Task When_aspnet_webapi_workspace_request_succeeds_then_standard_ou
             await package.CreateRoslynWorkspaceForRunAsync(new TimeBudget(10.Minutes()));
             var workspace = WorkspaceFactory.CreateWorkspaceFromDirectory(package.Directory, package.Directory.Name);
 
-            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/api/values", "get"), requestId: "TestRun");
+            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/custom/values", "get"), requestId: "TestRun");
 
             var response = await CallRun(request.ToJson(), 30000);
 
@@ -693,7 +693,7 @@ public async Task When_aspnet_webapi_workspace_request_fails_then_diagnostics_ar
                 files: workspace.Files.ToArray(),
                 workspaceType: workspace.WorkspaceType);
 
-            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/api/values", "get"), requestId: "TestRun");
+            var request = new WorkspaceRequest(workspace, httpRequest: new HttpRequest("/custom/values", "get"), requestId: "TestRun");
 
             var response = await CallRun(request.ToJson(), null);
 
diff --git a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
index d9c3af752..6a68f10bf 100644
--- a/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
+++ b/WorkspaceServer.Tests/AspNetWorkspaceTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Net.Http;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Clockwise;
 using FluentAssertions;
@@ -14,7 +13,6 @@
 using WorkspaceServer.Models.Execution;
 using WorkspaceServer.Servers.Roslyn;
 using WorkspaceServer.Features;
-using WorkspaceServer.Packaging;
 using Xunit;
 using Xunit.Abstractions;
 using Package = WorkspaceServer.Packaging.Package;
@@ -47,7 +45,7 @@ public async Task Run_starts_the_kestrel_server_and_provides_a_WebServer_feature
             {
                 var webServer = runResult.GetFeature<WebServer>();
 
-                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values")).CancelIfExceeds(new TimeBudget(35.Seconds()));
+                var response = await webServer.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/custom/values")).CancelIfExceeds(new TimeBudget(35.Seconds()));
 
                 var result = await response.EnsureSuccess()
                                            .DeserializeAs<string[]>();
diff --git a/WorkspaceServer.Tests/Default.cs b/WorkspaceServer.Tests/Default.cs
index 4bb3f3fc8..b5d297248 100644
--- a/WorkspaceServer.Tests/Default.cs
+++ b/WorkspaceServer.Tests/Default.cs
@@ -56,18 +56,16 @@ public class Default
         {
             var packageBuilder = new PackageBuilder("aspnet.webapi");
             packageBuilder.CreateUsingDotnet("webapi");
-            packageBuilder.DeleteFile("WeatherForecast.cs");
-            packageBuilder.DeleteFile("Controllers/WeatherForecastController.cs");
-            packageBuilder.WriteFile("Controllers/ApiController.cs", @"using System.Collections.Generic;
+            packageBuilder.WriteFile("Controllers/CustomController.cs", @"using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 
 namespace aspnet.webapi.Controllers
 {
     [ApiController]
     [Route(""[controller]"")]
-    public class ApiController : ControllerBase
+    public class CustomController : ControllerBase
     {
-        public ApiController() { }
+        public CustomController() { }
 
         [HttpGet(""values"")]
         public IEnumerable<string> Values()
diff --git a/WorkspaceServer.Tests/WebServerTests.cs b/WorkspaceServer.Tests/WebServerTests.cs
index 67ed025d9..9405a04b3 100644
--- a/WorkspaceServer.Tests/WebServerTests.cs
+++ b/WorkspaceServer.Tests/WebServerTests.cs
@@ -33,8 +33,8 @@ public async Task Multiple_WebServer_instances_can_be_run_concurrently_in_the_sa
             using (var webServer1 = new WebServer(workspace))
             using (var webServer2 = new WebServer(workspace))
             {
-                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
-                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/api/values"));
+                var response1 = await webServer1.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/custom/values"));
+                var response2 = await webServer2.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/custom/values"));
 
                 response1.EnsureSuccess();
                 response2.EnsureSuccess();