1.0.0-preview8-03

chanan · Aug 15, 2019 · 475b02b · 475b02b
1 parent fee26b4
commit 475b02b
Show file tree

Hide file tree

Showing 66 changed files with 204 additions and 498 deletions.
diff --git a/docs/_content/BlazorPrettyCode/PrettyCodeDefault.json b/docs/_content/BlazorPrettyCode/PrettyCodeDefault.json
diff --git a/docs/_content/BlazorPrettyCode/SolarizedDark.json b/docs/_content/BlazorPrettyCode/SolarizedDark.json
diff --git a/docs/_content/BlazorPrettyCode/SolarizedLight.json b/docs/_content/BlazorPrettyCode/SolarizedLight.json
diff --git a/docs/_content/SamplePages/snippets/badHtml.html b/docs/_content/SamplePages/snippets/badHtml.html
diff --git a/docs/_content/SamplePages/snippets/clientside.html b/docs/_content/SamplePages/snippets/clientside.html
diff --git a/docs/_content/SamplePages/snippets/collapseExample.html b/docs/_content/SamplePages/snippets/collapseExample.html
diff --git a/docs/_content/SamplePages/snippets/demo.html b/docs/_content/SamplePages/snippets/demo.html
diff --git a/docs/_content/SamplePages/snippets/demoAttributes.html b/docs/_content/SamplePages/snippets/demoAttributes.html
diff --git a/docs/_content/SamplePages/snippets/demoSnippet.html b/docs/_content/SamplePages/snippets/demoSnippet.html
diff --git a/docs/_content/SamplePages/snippets/githubSnippet.html b/docs/_content/SamplePages/snippets/githubSnippet.html
diff --git a/docs/_content/SamplePages/snippets/highlights.html b/docs/_content/SamplePages/snippets/highlights.html
diff --git a/docs/_content/SamplePages/snippets/hover.html b/docs/_content/SamplePages/snippets/hover.html
diff --git a/docs/_content/SamplePages/snippets/serverside.html b/docs/_content/SamplePages/snippets/serverside.html
diff --git a/docs/_content/SamplePages/snippets/startup.html b/docs/_content/SamplePages/snippets/startup.html
diff --git a/docs/_content/SamplePages/snippets/titleExample.html b/docs/_content/SamplePages/snippets/titleExample.html
diff --git a/docs/_content/SamplePages/snippets/usingSimple.html b/docs/_content/SamplePages/snippets/usingSimple.html
diff --git a/docs/_content/SamplePages/snippets/usingThemes.html b/docs/_content/SamplePages/snippets/usingThemes.html
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.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.ComponentModel.Annotations.dll b/docs/_framework/_bin/System.ComponentModel.Annotations.dll
diff --git a/docs/_framework/_bin/System.Core.dll b/docs/_framework/_bin/System.Core.dll
diff --git a/docs/_framework/_bin/System.Data.dll b/docs/_framework/_bin/System.Data.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.Numerics.dll b/docs/_framework/_bin/System.Numerics.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.Runtime.Serialization.dll b/docs/_framework/_bin/System.Runtime.Serialization.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.Xml.Linq.dll b/docs/_framework/_bin/System.Xml.Linq.dll
diff --git a/docs/_framework/_bin/System.Xml.dll b/docs/_framework/_bin/System.Xml.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.Components.Browser.dll","Microsoft.AspNetCore.Components.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","Newtonsoft.Json.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.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.Browser.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","Newtonsoft.Json.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
@@ -2,16 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IsPackable>true</IsPackable>
-    <RestoreAdditionalProjectSources>
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
+    <RazorLangVersion>3.0</RazorLangVersion>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>BlazorPrettyCode</PackageId>
-    <Version>1.0.0-preview7-07</Version>
+    <Version>1.0.0-preview8-03</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>Blazor PrettyCode</Title>
     <Description>Razor Code Display Component</Description>
@@ -20,17 +16,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorStyled" Version="1.0.0-preview7-05" />
-    <PackageReference Include="CSHTMLTokenizer" Version="0.7.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="BlazorStyled" Version="1.0.0-preview8-02" />
+    <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" />
   </ItemGroup>
-
-    <ItemGroup>
-    <!-- .js/.css files will be referenced via <script>/<link> tags; other content files will just be included in the app's 'dist' directory without any tags referencing them -->
-    <EmbeddedResource Include="wwwroot\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
-    <EmbeddedResource Include="wwwroot\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
-    <EmbeddedResource Include="wwwroot\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
+
+  <ItemGroup>
+    <PackageReference Include="CSHTMLTokenizer" Version="0.7.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BlazorPrettyCode/PrettyCode.cs b/src/BlazorPrettyCode/PrettyCode.cs
@@ -17,20 +17,20 @@ namespace BlazorPrettyCode
 {
     public class PrettyCode : ComponentBase
     {
-        [Parameter] private bool? Debug { get; set; } = null;
-        [Parameter] private string CodeFile { get; set; }
-        [Parameter] private string CodeFileLineNumbers { get; set; }
-        [Parameter] private string CodeSectionFile { get; set; }
-        [Parameter] private string CodeSectionFileLineNumbers { get; set; }
-        [Parameter] private string Theme { get; set; }
-        [Parameter] private bool? ShowLineNumbers { get; set; } = null;
-        [Parameter] private string HighlightLines { get; set; }
-        [Parameter] private bool? ShowException { get; set; } = null;
-        [Parameter] private bool? ShowCollapse { get; set; } = null;
-        [Parameter] private string Title { get; set; } = null;
-        [Parameter] private bool? IsCollapsed { get; set; } = null;
-        [Parameter] private bool? AttemptToFixTabs { get; set; } = null;
-        [Parameter] private bool? KeepOriginalLineNumbers { get; set; } = false;
+        [Parameter] public bool? Debug { get; set; } = null;
+        [Parameter] public string CodeFile { get; set; }
+        [Parameter] public string CodeFileLineNumbers { get; set; }
+        [Parameter] public string CodeSectionFile { get; set; }
+        [Parameter] public string CodeSectionFileLineNumbers { get; set; }
+        [Parameter] public string Theme { get; set; }
+        [Parameter] public bool? ShowLineNumbers { get; set; } = null;
+        [Parameter] public string HighlightLines { get; set; }
+        [Parameter] public bool? ShowException { get; set; } = null;
+        [Parameter] public bool? ShowCollapse { get; set; } = null;
+        [Parameter] public string Title { get; set; } = null;
+        [Parameter] public bool? IsCollapsed { get; set; } = null;
+        [Parameter] public bool? AttemptToFixTabs { get; set; } = null;
+        [Parameter] public bool? KeepOriginalLineNumbers { get; set; } = false;
 
         private List<Line> Lines { get; set; } = new List<Line>();
         private int i = 0;
@@ -77,7 +77,7 @@ public class PrettyCode : ComponentBase
 
         private IStyled _styled;
 
-        protected override async Task OnInitAsync()
+        protected override async Task OnInitializedAsync()
         {
             _styled = Styled.WithId("pretty-code");
             bool debug = Debug ?? DefaultConfig.IsDevelopmentMode;
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.Components.Browser.dll","Microsoft.AspNetCore.Components.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","Newtonsoft.Json.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.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.Browser.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","Newtonsoft.Json.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}