dotnet · colombod · Jul 16, 2019 · Jul 15, 2019 · Jul 15, 2019 · Jul 15, 2019
diff --git 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/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/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/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/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)" />
 

diff --git 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();
             }