1.0.0-preview9-01

chanan · Sep 5, 2019 · 8c25c63 · 8c25c63
1 parent 162fc4f
commit 8c25c63
Show file tree

Hide file tree

Showing 49 changed files with 207 additions and 204 deletions.
diff --git a/docs/_framework/_bin/BlazorPrettyCode.dll b/docs/_framework/_bin/BlazorPrettyCode.dll
diff --git a/docs/_framework/_bin/BlazorPrettyCode.pdb b/docs/_framework/_bin/BlazorPrettyCode.pdb
diff --git a/docs/_framework/_bin/BlazorStyled.dll b/docs/_framework/_bin/BlazorStyled.dll
diff --git a/docs/_framework/_bin/BlazorTypography.dll b/docs/_framework/_bin/BlazorTypography.dll
diff --git a/docs/_framework/_bin/ClientSideSample.dll b/docs/_framework/_bin/ClientSideSample.dll
diff --git a/docs/_framework/_bin/ClientSideSample.pdb b/docs/_framework/_bin/ClientSideSample.pdb
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Authorization.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Authorization.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.HttpClient.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.HttpClient.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.Forms.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.Forms.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.Web.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.Web.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Metadata.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Metadata.dll
diff --git a/docs/_framework/_bin/Microsoft.Bcl.AsyncInterfaces.dll b/docs/_framework/_bin/Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.dll b/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Logging.Abstractions.dll b/docs/_framework/_bin/Microsoft.Extensions.Logging.Abstractions.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Options.dll b/docs/_framework/_bin/Microsoft.Extensions.Options.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Primitives.dll b/docs/_framework/_bin/Microsoft.Extensions.Primitives.dll
diff --git a/docs/_framework/_bin/Microsoft.JSInterop.dll b/docs/_framework/_bin/Microsoft.JSInterop.dll
diff --git a/docs/_framework/_bin/Mono.Security.dll b/docs/_framework/_bin/Mono.Security.dll
diff --git a/docs/_framework/_bin/Mono.WebAssembly.Interop.dll b/docs/_framework/_bin/Mono.WebAssembly.Interop.dll
diff --git a/docs/_framework/_bin/SamplePages.dll b/docs/_framework/_bin/SamplePages.dll
diff --git a/docs/_framework/_bin/SamplePages.pdb b/docs/_framework/_bin/SamplePages.pdb
diff --git a/docs/_framework/_bin/System.Core.dll b/docs/_framework/_bin/System.Core.dll
diff --git a/docs/_framework/_bin/System.Net.Http.dll b/docs/_framework/_bin/System.Net.Http.dll
diff --git a/docs/_framework/_bin/System.Runtime.CompilerServices.Unsafe.dll b/docs/_framework/_bin/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/docs/_framework/_bin/System.Text.Encodings.Web.dll b/docs/_framework/_bin/System.Text.Encodings.Web.dll
diff --git a/docs/_framework/_bin/System.Text.Json.dll b/docs/_framework/_bin/System.Text.Json.dll
diff --git a/docs/_framework/_bin/System.dll b/docs/_framework/_bin/System.dll
diff --git a/docs/_framework/_bin/mscorlib.dll b/docs/_framework/_bin/mscorlib.dll
diff --git a/docs/_framework/blazor.boot.json b/docs/_framework/blazor.boot.json
@@ -1 +1 @@
-{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
+{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Forms.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
diff --git a/docs/_framework/blazor.server.js b/docs/_framework/blazor.server.js
diff --git a/docs/_framework/blazor.webassembly.js b/docs/_framework/blazor.webassembly.js
diff --git a/docs/_framework/wasm/mono.js b/docs/_framework/wasm/mono.js
diff --git a/docs/_framework/wasm/mono.wasm b/docs/_framework/wasm/mono.wasm
diff --git a/src/BlazorPrettyCode/BlazorPrettyCode.csproj b/src/BlazorPrettyCode/BlazorPrettyCode.csproj
@@ -6,7 +6,7 @@
     <LangVersion>7.3</LangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>BlazorPrettyCode</PackageId>
-    <Version>1.0.0-preview8-08</Version>
+    <Version>1.0.0-preview9-01</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>Blazor PrettyCode</Title>
     <Description>Razor Code Display Component</Description>
@@ -15,9 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorStyled" Version="1.0.0-preview8-04" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
+
+    <PackageReference Include="BlazorStyled" Version="1.0.0-preview9-01" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BlazorPrettyCode/CodeThemeSwitcher.razor b/src/BlazorPrettyCode/CodeThemeSwitcher.razor
@@ -1,14 +1,15 @@
-@inject IDefaultSettings DefaultSettings
+@using Microsoft.AspNetCore.Components.Web
+@inject IDefaultSettings DefaultSettings
 
-    <select value="@theme" @onchange="@OnChangeTheme">
-        <option value="PrettyCodeDefault">Default</option>
-        <option value="GithubPlus">Github Plus</option>
-        <option value="Material">Material</option>
-        <option value="SolarizedDark">Solarized Dark</option>
-        <option value="SolarizedLight">Solarized Light</option>
-        <option value="WinterIsComingDark">Winter is Coming Dark</option>
-        <option value="WinterIsComingLight">Winter is Coming Light</option>
-    </select>
+<select value="@theme" @onchange="OnChangeTheme">
+    <option value="PrettyCodeDefault">Default</option>
+    <option value="GithubPlus">Github Plus</option>
+    <option value="Material">Material</option>
+    <option value="SolarizedDark">Solarized Dark</option>
+    <option value="SolarizedLight">Solarized Light</option>
+    <option value="WinterIsComingDark">Winter is Coming Dark</option>
+    <option value="WinterIsComingLight">Winter is Coming Light</option>
+</select>
 
 @code {
     //TODO: Change this to use reflection instead of hard coding classes
@@ -19,7 +20,7 @@
         theme = DefaultSettings.DefaultTheme;
     }
 
-    protected void OnChangeTheme(UIChangeEventArgs e)
+    protected void OnChangeTheme(ChangeEventArgs e)
     {
         theme = (string)e.Value;
         DefaultSettings.DefaultTheme = theme;

diff --git a/src/BlazorPrettyCode/PrettyCode.cs b/src/BlazorPrettyCode/PrettyCode.cs
@@ -4,7 +4,8 @@
 using CSHTMLTokenizer;
 using CSHTMLTokenizer.Tokens;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.Web;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -628,7 +629,7 @@ private void BuildRenderTitle(RenderTreeBuilder builderTitle)
             {
                 builderTitle.OpenElement(Next(), "span");
                 builderTitle.AddAttribute(Next(), "class", _baseCollapse);
-                builderTitle.AddAttribute(3, "onclick", EventCallback.Factory.Create<UIMouseEventArgs>(this, OnClick));
+                builderTitle.AddAttribute(3, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnClick));
                 builderTitle.AddContent(Next(), _isCollapsed ? "Expand source" : "Collapse source");
                 builderTitle.CloseElement();
             }

diff --git a/src/BlazorPrettyCode/Themes/ThemeCache.cs b/src/BlazorPrettyCode/Themes/ThemeCache.cs
@@ -1,7 +1,6 @@
 using BlazorPrettyCode.Internal;
 using System;
 using System.Collections.Concurrent;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace BlazorPrettyCode.Themes

diff --git a/src/Sample/ClientSideSample.csproj b/src/Sample/ClientSideSample.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sample/_Imports.razor b/src/Sample/_Imports.razor
@@ -1,6 +1,7 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using BlazorPrettyCode
 @using BlazorStyled
 @using Polished
diff --git a/src/SamplePages/App.razor b/src/SamplePages/App.razor
@@ -1,5 +1,10 @@
 <Router AppAssembly="typeof(App).Assembly">
-    <NotFoundContent>
-        <p>Sorry, there's nothing at this address.</p>
-    </NotFoundContent>
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
 </Router>
diff --git a/src/SamplePages/Pages/_Imports.razor b/src/SamplePages/Pages/_Imports.razor
diff --git a/src/SamplePages/SamplePages.csproj b/src/SamplePages/SamplePages.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorTypography" Version="1.0.0-preview8-04" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
+    <PackageReference Include="BlazorTypography" Version="1.0.0-preview9-01" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SamplePages/_Imports.razor b/src/SamplePages/_Imports.razor
@@ -1,6 +1,7 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using SamplePages
 @using SamplePages.Shared

diff --git a/src/ServerSideSample/Pages/_Host.cshtml b/src/ServerSideSample/Pages/_Host.cshtml
@@ -9,10 +9,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Blazor Pretty Code Server Side Sample</title>
     <base href="~/" />
-    @(await Html.RenderComponentAsync<BlazorStyled.ServerSideStyled>())
+    @(await Html.RenderComponentAsync<BlazorStyled.ServerSideStyled>(RenderMode.Server))
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<SamplePages.App>())</app>
+    <app>@(await Html.RenderComponentAsync<SamplePages.App>(RenderMode.Server))</app>
 
     <script src="_framework/blazor.server.js"></script>
 </body>

diff --git a/src/ServerSideSample/Startup.cs b/src/ServerSideSample/Startup.cs
@@ -36,10 +36,10 @@ public void ConfigureServices(IServiceCollection services)
                 services.AddScoped<HttpClient>(s =>
                 {
                     // Creating the URI helper needs to wait until the JS Runtime is initialized, so defer it.
-                    IUriHelper uriHelper = s.GetRequiredService<IUriHelper>();
+                    NavigationManager navigationManager = s.GetRequiredService<NavigationManager>();
                     return new HttpClient
                     {
-                        BaseAddress = new Uri(uriHelper.GetBaseUri())
+                        BaseAddress = new Uri(navigationManager.BaseUri)
                     };
                 });
             }

diff --git a/src/ServerSideSample/_Imports.razor b/src/ServerSideSample/_Imports.razor
@@ -1,6 +1,7 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using ServerSideSample
 @using BlazorPrettyCode
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
		{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Forms.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}