Upgraded 3.2.0 preview1

chanan · Feb 2, 2020 · a496c48 · a496c48
1 parent d325f55
commit a496c48
Show file tree

Hide file tree

Showing 49 changed files with 330 additions and 341 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.Extensions.Configuration.Abstractions.dll b/docs/_framework/_bin/Microsoft.Extensions.Configuration.Abstractions.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Configuration.dll b/docs/_framework/_bin/Microsoft.Extensions.Configuration.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.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.ComponentModel.DataAnnotations.dll b/docs/_framework/_bin/System.ComponentModel.DataAnnotations.dll
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/WebAssembly.Bindings.dll b/docs/_framework/_bin/WebAssembly.Bindings.dll
diff --git a/docs/_framework/_bin/WebAssembly.Net.Http.dll b/docs/_framework/_bin/WebAssembly.Net.Http.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 @@
-{"assemblies":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","ClientSideSample.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.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.ComponentModel.DataAnnotations.dll","System.Core.dll","System.dll","System.Net.Http.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","WebAssembly.Bindings.dll","WebAssembly.Net.Http.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"entryAssembly":"ClientSideSample","linkerEnabled":true}
+{"assemblies":["BlazorPrettyCode.dll","BlazorPrettyCode.pdb","BlazorPrettyCode.pdb","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","ClientSideSample.dll","ClientSideSample.pdb","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Components.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.Configuration.Abstractions.dll","Microsoft.Extensions.Configuration.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.WebAssembly.Interop.dll","Polished.net.dll","SamplePages.dll","SamplePages.pdb","SamplePages.pdb","Stateless.dll","System.Core.dll","System.Net.Http.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.dll","WebAssembly.Bindings.dll","WebAssembly.Net.Http.dll","mscorlib.dll"],"entryAssembly":"ClientSideSample","linkerEnabled":true}
diff --git a/docs/_framework/blazor.webassembly.js b/docs/_framework/blazor.webassembly.js
diff --git a/docs/_framework/wasm/dotnet.js b/docs/_framework/wasm/dotnet.js
diff --git a/docs/_framework/wasm/dotnet.wasm b/docs/_framework/wasm/dotnet.wasm
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.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>Blazor PrettyCode</Title>
     <Description>Razor Code Display Component</Description>
@@ -15,9 +15,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorStyled" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+    <PackageReference Include="BlazorStyled" Version="1.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

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.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sample/Program.cs b/src/Sample/Program.cs
@@ -1,18 +1,29 @@
-using Microsoft.AspNetCore.Blazor.Hosting;
+using BlazorPrettyCode;
+using BlazorStyled;
+using BlazorTypography;
+using Microsoft.AspNetCore.Blazor.Hosting;
+using SamplePages;
+using System.Threading.Tasks;
 
 namespace Sample
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
-        }
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-        public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args)
-        {
-            return BlazorWebAssemblyHost.CreateDefaultBuilder()
-.UseBlazorStartup<Startup>();
+            //Configure Services
+            builder.Services.AddBlazorPrettyCode();
+            builder.Services.AddTypography();
+            //End Configure Services
+
+            builder.RootComponents.Add<App>("app");
+
+            //Add BlazorStyled to root components
+            builder.RootComponents.Add<ClientSideStyled>("#styled");
+
+            await builder.Build().RunAsync();
         }
     }
 }
diff --git a/src/Sample/Startup.cs b/src/Sample/Startup.cs
diff --git a/src/SamplePages/Pages/Index.razor b/src/SamplePages/Pages/Index.razor
@@ -45,7 +45,7 @@
     In the <code>Configure</code> method add <code>app.AddComponent&lt;ClientSideStyled>("#styled");</code> as well as shown below:
 </p>
 
-<PrettyCode CodeFile="_content/SamplePages/snippets/startup.html" HighlightLines="5,11" Title="Startup.cs" />
+<PrettyCode CodeFile="_content/SamplePages/snippets/program.html" HighlightLines="7,11" Title="Program.cs" />
 
 <p>For Client Side Blazor, in your <code>index.html</code> add a <code>style</code> tag:</p>
 

diff --git a/src/SamplePages/SamplePages.csproj b/src/SamplePages/SamplePages.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorTypography" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+    <PackageReference Include="BlazorTypography" Version="1.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SamplePages/wwwroot/snippets/program.html b/src/SamplePages/wwwroot/snippets/program.html
@@ -0,0 +1,15 @@
+public class Program
+{
+    public static async Task Main(string[] args)
+    {
+        var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+        builder.Services.AddBlazorPrettyCode();
+        builder.RootComponents.Add<App>("app");
+
+        //Add BlazorStyled to root components
+        builder.RootComponents.Add<ClientSideStyled>("#styled");
+
+        await builder.Build().RunAsync();
+    }
+}
diff --git a/src/SamplePages/wwwroot/snippets/serverside.html b/src/SamplePages/wwwroot/snippets/serverside.html
@@ -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/SamplePages/wwwroot/snippets/startup.html b/src/SamplePages/wwwroot/snippets/startup.html
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"assemblies":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","ClientSideSample.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.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.ComponentModel.DataAnnotations.dll","System.Core.dll","System.dll","System.Net.Http.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","WebAssembly.Bindings.dll","WebAssembly.Net.Http.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"entryAssembly":"ClientSideSample","linkerEnabled":true}
		{"assemblies":["BlazorPrettyCode.dll","BlazorPrettyCode.pdb","BlazorPrettyCode.pdb","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","ClientSideSample.dll","ClientSideSample.pdb","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Components.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.Configuration.Abstractions.dll","Microsoft.Extensions.Configuration.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.WebAssembly.Interop.dll","Polished.net.dll","SamplePages.dll","SamplePages.pdb","SamplePages.pdb","Stateless.dll","System.Core.dll","System.Net.Http.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.dll","WebAssembly.Bindings.dll","WebAssembly.Net.Http.dll","mscorlib.dll"],"entryAssembly":"ClientSideSample","linkerEnabled":true}