dotnet · brettfo · Oct 3, 2019 · Sep 16, 2019 · Sep 16, 2019 · Sep 19, 2019
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,8 +5,7 @@
   <Import Project="eng\targets\NuGet.targets" />
 
   <PropertyGroup>
-    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-
+    <PackageIcon>icon.png</PackageIcon>
     <!-- private repo, don't do source-link -->
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
     <EnableSourceLink>false</EnableSourceLink>
@@ -15,6 +14,10 @@
     <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
   <PropertyGroup>
    <!-- These properties are needed so that version number can be same for MLS.Agent.Tools and the libraries that depend on it -->  
     <NewtonsoftJsonVersion>12.0.02</NewtonsoftJsonVersion>

diff --git a/...ntracts/ApiOutputContractTests.The_Completions_contract_has_not_been_broken.approved.json b/...ntracts/ApiOutputContractTests.The_Completions_contract_has_not_been_broken.approved.json
@@ -425,7 +425,7 @@
       "sortText": "SetOut",
       "insertText": "SetOut",
       "documentation": {
-        "value": "Sets the System.Console.Out  property to the specified System.IO.TextWriter  object.",
+        "value": "Sets the System.Console.Out  property to target the System.IO.TextWriter  object.",
         "isTrusted": false
       }
     },

diff --git a/...acts/ApiOutputContractTests.The_signature_help_contract_has_not_been_broken.approved.json b/...acts/ApiOutputContractTests.The_signature_help_contract_has_not_been_broken.approved.json
@@ -74,7 +74,7 @@
           "name": "index",
           "label": "int index",
           "documentation": {
-            "value": "**index**: The starting position in buffer.",
+            "value": "**index**: The starting position in buffer .",
             "isTrusted": false
           }
         },
@@ -234,7 +234,7 @@
           "name": "arg0",
           "label": "object arg0",
           "documentation": {
-            "value": "**arg0**: An object to write using format.",
+            "value": "**arg0**: An object to write using format .",
             "isTrusted": false
           }
         }
@@ -260,15 +260,15 @@
           "name": "arg0",
           "label": "object arg0",
           "documentation": {
-            "value": "**arg0**: The first object to write using format.",
+            "value": "**arg0**: The first object to write using format .",
             "isTrusted": false
           }
         },
         {
           "name": "arg1",
           "label": "object arg1",
           "documentation": {
-            "value": "**arg1**: The second object to write using format.",
+            "value": "**arg1**: The second object to write using format .",
             "isTrusted": false
           }
         }
@@ -294,23 +294,23 @@
           "name": "arg0",
           "label": "object arg0",
           "documentation": {
-            "value": "**arg0**: The first object to write using format.",
+            "value": "**arg0**: The first object to write using format .",
             "isTrusted": false
           }
         },
         {
           "name": "arg1",
           "label": "object arg1",
           "documentation": {
-            "value": "**arg1**: The second object to write using format.",
+            "value": "**arg1**: The second object to write using format .",
             "isTrusted": false
           }
         },
         {
           "name": "arg2",
           "label": "object arg2",
           "documentation": {
-            "value": "**arg2**: The third object to write using format.",
+            "value": "**arg2**: The third object to write using format .",
             "isTrusted": false
           }
         }
@@ -336,7 +336,7 @@
           "name": "arg",
           "label": "params object[] arg",
           "documentation": {
-            "value": "**arg**: An array of objects to write using format.",
+            "value": "**arg**: An array of objects to write using format .",
             "isTrusted": false
           }
         }

diff --git a/MLS.Agent.Tests/MLS.Agent.Tests.csproj b/MLS.Agent.Tests/MLS.Agent.Tests.csproj
@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0-rc1.19457.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.02" />
     <PackageReference Include="Pocket.Disposable" Version="1.0.5">
       <PrivateAssets>all</PrivateAssets>

diff --git a/MLS.Agent.Tools/TypeExtensions.cs b/MLS.Agent.Tools/TypeExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 
 namespace MLS.Agent.Tools
 {
@@ -11,6 +12,11 @@ public static class TypeExtensions
         public static string ReadManifestResource(this Type type, string resourceName)
         {
             var assembly = type.Assembly;
+            if (!assembly.GetManifestResourceNames().Contains(resourceName))
+            {
+                throw new ArgumentException(assembly + " " + resourceName);
+            }
+
             using (var reader = new StreamReader(assembly.GetManifestResourceStream(resourceName)))
             {
                 return reader.ReadToEnd();

diff --git a/MLS.Agent/MLS.Agent.csproj b/MLS.Agent/MLS.Agent.csproj
@@ -60,6 +60,7 @@
     <PackageReference Include="Markdig" Version="0.17.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.0.0-rc1.19457.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview7.19365.7" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.4" PrivateAssets="all" />
     <PackageReference Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
@@ -113,7 +114,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\MLS.PackageTool\MLS.PackageTool.csproj" />
-    <EmbeddedResource Include="..\MLS.PackageTool\Program.cs" />
+    <EmbeddedResource Include="..\MLS.PackageTool\Program.cs">
+      <LogicalName>MLS.Agent.Program.cs</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="$(IntermediateOutputPath)/demo.zip">
       <LogicalName>demo.zip</LogicalName>
     </EmbeddedResource>

diff --git a/MLS.Agent/Startup.cs b/MLS.Agent/Startup.cs
@@ -136,7 +136,6 @@ public void ConfigureServices(IServiceCollection services)
                     options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
                     {
                         MediaTypeNames.Application.Octet,
-                        WasmMediaTypeNames.Application.Wasm
                     });
                 });
 

diff --git a/MLS.Blazor/App.razor b/MLS.Blazor/App.razor
@@ -1,5 +1,3 @@
 <Router AppAssembly="typeof(Program).Assembly">
-    <NotFoundContent>
-        <p>Sorry, there's nothing at this address.</p>
-    </NotFoundContent>
+
 </Router>
diff --git a/MLS.Blazor/MLS.Blazor.csproj b/MLS.Blazor/MLS.Blazor.csproj
@@ -23,9 +23,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19457.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 
@@ -34,7 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Linker.xml" /> 
+    <EmbeddedResource Include="Linker.xml" />
+    <EmbeddedResource Include="App.razor" />
     <EmbeddedResource Include="Program.cs" />
     <EmbeddedResource Include="Startup.cs" />
     <EmbeddedResource Include="wwwroot\index.html" />

diff --git a/MLS.Blazor/Pages/Index.razor b/MLS.Blazor/Pages/Index.razor
@@ -3,9 +3,6 @@
 @inject IJSRuntime jsRuntime;
 <h1>Hello, world!</h1>
 
-Welcome to your new app.
-
-<SurveyPrompt Title="How is Blazor working for you?" />
 
 @using Newtonsoft.Json;
 @using Newtonsoft.Json.Linq;
@@ -15,44 +12,48 @@ Welcome to your new app.
 
 private CodeRunner runner = new CodeRunner();
 
-protected override async Task OnAfterRenderAsync()
+protected override async Task OnAfterRenderAsync(bool firstRender)
 {
-    await base.OnAfterRenderAsync();
+    await base.OnAfterRenderAsync(firstRender);
 
+    if (firstRender)
+    {
     await jsRuntime.InvokeAsync<object>(
-            "BlazorInterop.install",
-            DotNetObjectRef.Create(this));
-
-    await PostMessage(JObject.FromObject(new { ready = true }).ToString());
-}
+        "BlazorInterop.install",
+        DotNetObjectReference.Create(this));
 
-public Task<string> PostMessage(string message)
-{
-    // Implemented in interop.js
-    return jsRuntime.InvokeAsync<string>(
-        "BlazorInterop.postMessage",
-        message);
+        await PostMessage(JObject.FromObject(new { ready = true }).ToString());
+    }
 }
 
-[JSInvokable("MLS.Blazor.PostMessageAsync")]
-public async Task<string> PostMessageAsync(string message)
-{
-    try
+    public ValueTask<string> PostMessage(string message)
     {
-        var result = runner.ProcessRunRequest(message);
-        var logMsg = $"Computed {JObject.FromObject(result).ToString()}";
-        await jsRuntime.InvokeAsync<string>("BlazorInterop.log", logMsg);
+        // Implemented in interop.js
+        return jsRuntime.InvokeAsync<string>
+            ("BlazorInterop.postMessage", message);
+    }
 
-        if (result != null)
+    [JSInvokable("MLS.Blazor.PostMessageAsync")]
+    public async Task<string>
+    PostMessageAsync(string message)
+    {
+        try
         {
+            var result = runner.ProcessRunRequest(message);
+            var logMsg = $"Computed {JObject.FromObject(result).ToString()}";
+            await jsRuntime.InvokeAsync<string>("BlazorInterop.log", logMsg);
+
+            if (result != null)
+            {
             return JObject.FromObject(result).ToString();
             // await PostMessage(JObject.FromObject(result).ToString());
+            }
+            }
+            catch
+            {
+            }
+
+            return null;
         }
     }
-    catch
-    {
-    }
-
-    return null;
-}
-}
+}
diff --git a/MLS.Blazor/_Imports.razor b/MLS.Blazor/_Imports.razor
@@ -1,6 +1,6 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
+@using  Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using MLS.Blazor
diff --git a/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs b/WorkspaceServer.Tests/BlazorPackageInitializerTests.cs
@@ -45,6 +45,7 @@ public async Task Initializes_project_with_right_files()
             await initializer.Initialize(dir);
 
             var rootFiles = dir.GetFiles();
+            rootFiles.Should().Contain(f => f.Name == "App.razor");
             rootFiles.Should().Contain(f => f.Name == "Program.cs");
             rootFiles.Should().Contain(f => f.Name == "Startup.cs");
             rootFiles.Should().Contain(f => f.Name == "Linker.xml");

diff --git a/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs b/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs
@@ -718,7 +718,7 @@ public static IEnumerable<int> Fibonacci()
 
             sample.Parameters.ElementAt(1).Name.Should().Be("arg");
             sample.Parameters.ElementAt(1).Label.Should().Be("params object[] arg");
-            sample.Parameters.ElementAt(1).Documentation.Value.Should().Contain("An array of objects to write using format.");
+            sample.Parameters.ElementAt(1).Documentation.Value.Should().Contain("An array of objects to write using format .");
         }
     }
 }
diff --git a/WorkspaceServer/Packaging/BlazorPackageInitializer.cs b/WorkspaceServer/Packaging/BlazorPackageInitializer.cs
@@ -17,7 +17,7 @@ public class BlazorPackageInitializer : PackageInitializer
         private readonly List<(string packageName, string packageVersion)> _addPackages;
 
         public BlazorPackageInitializer(string name, List<(string packageName, string packageVersion)> addPackages) :
-            base("blazor", "MLS.Blazor")
+            base("blazorwasm", "MLS.Blazor")
         {
             _name = name;
             var packages = addPackages ?? throw new ArgumentNullException(nameof(addPackages));
@@ -84,7 +84,7 @@ private void AddEmbeddedResourceContentToProject(string root)
         {
             var wwwRootFiles = new[] { "index.html", "interop.js" };
             var pagesFiles = new[] { "Index.razor" };
-            var rootFiles = new[] { "Program.cs", "Startup.cs", "CodeRunner.cs", "InteropMessage.cs", "SerializableDiagnostic.cs", "WasmCodeRunnerRequest.cs", "WasmCodeRunnerResponse.cs", "CommandLineBuilderExtensions.cs", "EntryPointDiscoverer.cs", "PreserveConsoleState.cs", "_Imports.razor", "Linker.xml" };
+            var rootFiles = new[] {"App.razor", "Program.cs", "Startup.cs", "CodeRunner.cs", "InteropMessage.cs", "SerializableDiagnostic.cs", "WasmCodeRunnerRequest.cs", "WasmCodeRunnerResponse.cs", "CommandLineBuilderExtensions.cs", "EntryPointDiscoverer.cs", "PreserveConsoleState.cs", "_Imports.razor", "Linker.xml" };
 
             WriteResourcesToLocation(wwwRootFiles, Path.Combine(root, "wwwroot"));
             WriteResourcesToLocation(pagesFiles, Path.Combine(root, "Pages"));

diff --git a/WorkspaceServer/WorkspaceServer.csproj b/WorkspaceServer/WorkspaceServer.csproj
@@ -123,6 +123,7 @@
     <EmbeddedResource Include="..\MLS.Blazor\wwwroot\interop.js" />
     <!--<EmbeddedResource Include="..\MLS.Blazor\Pages\_Imports.razor" />-->
     <EmbeddedResource Include="..\MLS.Blazor\_Imports.razor" />
+    <EmbeddedResource Include="..\MLS.Blazor\App.razor" />
     <EmbeddedResource Include="..\MLS.Blazor\Pages\Index.razor" />
 
     <EmbeddedResource Include="..\WasmCodeRunner\CodeRunner.cs" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,9 +16,9 @@ variables:
   - name: _DotNetArtifactsCategory
     value: .NETCore
   - name: BlazorTemplateVersion
-    value: 3.0.0-preview7.19365.7
+    value: 3.0.0-preview9.19457.4
   - name: DotNetSdkVersion
-    value: 3.0.100-preview7-012821
+    value: 3.0.100-rc1-014190
   - name: NodeJSVersion
     value: '>=12'
   - name: TryDotNetPackagesPath

diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.0.100-preview7-012821"
+    "version": "3.0.100-rc1-014190"
   },
   "tools": {
-    "dotnet": "3.0.100-preview7-012821"
+    "dotnet": "3.0.100-rc1-014190"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"

diff --git a/icon.png b/icon.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,6 @@ public void ConfigureServices(IServiceCollection services) @@
                         options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
                         {
                             MediaTypeNames.Application.Octet,
-                            WasmMediaTypeNames.Application.Wasm
                         });
                     });
@@ Expand Down @@