aspnet preview6

chanan · Jun 14, 2019 · 95f3037 · 95f3037
1 parent 0693125
commit 95f3037
Show file tree

Hide file tree

Showing 54 changed files with 319 additions and 33 deletions.
diff --git a/docs/_content/BlazorStyled/stlyed.js b/docs/_content/BlazorStyled/stlyed.js
@@ -4,7 +4,7 @@ var styleSheet = styleEl.sheet;
 
 window.styledJsFunctions = {
     insertRule: function (rule, development) {
-        //console.log(rule);
+        //console.log(rule)
         if (development) {
             var text = styleEl.innerText;
             text = text + rule;

diff --git a/docs/_framework/_bin/BlazorStyled.dll b/docs/_framework/_bin/BlazorStyled.dll
diff --git a/docs/_framework/_bin/BlazorStyled.pdb b/docs/_framework/_bin/BlazorStyled.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.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.Browser.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.Browser.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.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/Polished.net.dll b/docs/_framework/_bin/Polished.net.dll
diff --git a/docs/_framework/_bin/Sample.dll b/docs/_framework/_bin/Sample.dll
diff --git a/docs/_framework/_bin/Sample.pdb b/docs/_framework/_bin/Sample.pdb
diff --git a/docs/_framework/_bin/System.Buffers.dll b/docs/_framework/_bin/System.Buffers.dll
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.Memory.dll b/docs/_framework/_bin/System.Memory.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.Vectors.dll b/docs/_framework/_bin/System.Numerics.Vectors.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.Json.dll b/docs/_framework/_bin/System.Text.Json.dll
diff --git a/docs/_framework/_bin/System.Threading.Tasks.Extensions.dll b/docs/_framework/_bin/System.Threading.Tasks.Extensions.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":"Sample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorStyled.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Net.Http.dll","BlazorStyled.pdb","Sample.pdb"],"cssReferences":[],"jsReferences":["_content/BlazorStyled/stlyed.js"],"linkerEnabled":true}
+{"main":"Sample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorStyled.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.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","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.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorStyled.pdb","Sample.pdb"],"cssReferences":[],"jsReferences":["_content\u002fBlazorStyled\u002fstlyed.js"],"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/BlazorStyled/BlazorStyled.csproj b/src/BlazorStyled/BlazorStyled.csproj
@@ -11,7 +11,7 @@
     <RazorLangVersion>3.0</RazorLangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>BlazorStyled</PackageId>
-    <Version>1.0.0-preview4-01</Version>
+    <Version>1.0.0-preview6-02</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>BlazorStyled</Title>
     <Description>CSS in Blazor Components</Description>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview5-19227-01" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sample/Pages/Basic.razor b/src/Sample/Pages/Basic.razor
@@ -116,7 +116,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string example1, example2;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/ButtonExample.razor b/src/Sample/Pages/ButtonExample.razor
@@ -51,7 +51,7 @@
     }
 }</CodeBlock>
 
-@functions {
+@code {
     private void onclick(UIMouseEventArgs e)
     {
         Console.WriteLine("Onclick");

diff --git a/src/Sample/Pages/Index.razor b/src/Sample/Pages/Index.razor
@@ -39,7 +39,7 @@
 </CodeBlock>
 </div>
 
-@functions {
+@code {
     private string hover, example;
     private string color = "white";
 

diff --git a/src/Sample/Pages/Motivation.razor b/src/Sample/Pages/Motivation.razor
@@ -18,7 +18,7 @@
     <li class="@li"><a href="https://github.com/threepointone/glamor">Glamor</a></li>
 </ul>
 
-@functions {
+@code {
     private string ul, li;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/Nested.razor b/src/Sample/Pages/Nested.razor
@@ -92,7 +92,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string nested, paragraph, hover;
 
     private string color = "white";

diff --git a/src/Sample/Pages/PolishedExample.razor b/src/Sample/Pages/PolishedExample.razor
@@ -46,7 +46,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string arrow, gradient;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/Theming.razor b/src/Sample/Pages/Theming.razor
@@ -33,7 +33,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string example;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/fonts.razor b/src/Sample/Pages/fonts.razor
@@ -33,7 +33,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string p;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/keyframes.razor b/src/Sample/Pages/keyframes.razor
@@ -41,7 +41,7 @@
 }
 </CodeBlock>
 
-@functions {
+@code {
     private string bounce, example;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Pages/media.razor b/src/Sample/Pages/media.razor
@@ -60,7 +60,7 @@
 </CodeBlock>
 
 
-@functions {
+@code {
     private string p1, p2;
 
     private int[] breakpoints = new int[] { 576, 768, 992, 1200 };

diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview5-19227-01" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5-19227-01" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview5-19227-01" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
     <PackageReference Include="Polished" Version="1.0.0-preview-02" />
   </ItemGroup>
 

diff --git a/src/Sample/Shared/CodeBlock.razor b/src/Sample/Shared/CodeBlock.razor
@@ -1,11 +1,11 @@
 @inject IStyled Styled
 @inject IMixins Mixins
 
-<pre class="@pre"><code class="@code">@ChildContent</code></pre>
+<pre class="@pre"><code class="@codeClass">@ChildContent</code></pre>
 
-@functions {
+@code {
     [Parameter] private RenderFragment ChildContent { get; set; }
-    private string pre, code;
+    private string pre, codeClass;
 
     protected override async Task OnInitAsync()
     {
@@ -33,7 +33,7 @@
             background: rgb(40, 41, 54);
         ");
 
-        code = await Styled.Css(@"
+        codeClass = await Styled.Css(@"
             color: rgb(204, 204, 204);
             text-shadow: none;
             font-family: 'Fira Mono';

diff --git a/src/Sample/Shared/Heading.razor b/src/Sample/Shared/Heading.razor
@@ -11,7 +11,7 @@
 }
 
 
-@functions {
+@code {
     [Parameter] private RenderFragment ChildContent { get; set; }
     [Parameter]
     private HeadingSize HeadingSize { get; set; } = HeadingSize.H1;

diff --git a/src/Sample/Shared/Line.razor b/src/Sample/Shared/Line.razor
@@ -2,7 +2,7 @@
 
 <hr class="@hrClass" />
 
-@functions {
+@code {
     private string hrClass;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Shared/MainLayout.razor b/src/Sample/Shared/MainLayout.razor
@@ -22,7 +22,7 @@
         </div>
     </div>
 
-@functions {
+@code {
     private string container, navColumn, mainColumn, topNav, topMain, bottom, brand, ul, li;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Shared/MyButton.razor b/src/Sample/Shared/MyButton.razor
@@ -2,7 +2,7 @@
 
 <button class="@buttonClass" onclick="@OnClick">@ChildContent</button>
 
-@functions {
+@code {
     [Parameter] private RenderFragment ChildContent { get; set; }
     [Parameter] private EventCallback<UIMouseEventArgs> OnClick { get; set; }
     [Parameter] private string Color { get; set; } = "green";

diff --git a/src/Sample/Shared/NavMenu.razor b/src/Sample/Shared/NavMenu.razor
@@ -51,7 +51,7 @@
         </ul>
     </nav>
 
-@functions {
+@code {
     private string ul, link;
 
     protected override async Task OnInitAsync()

diff --git a/src/Sample/Shared/Paragraph.razor b/src/Sample/Shared/Paragraph.razor
@@ -2,7 +2,7 @@
 
 <p class="@paragraphClass">@ChildContent</p>
 
-@functions {
+@code {
     [Parameter] private RenderFragment ChildContent { get; set; }
     private string paragraphClass;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"main":"Sample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorStyled.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Net.Http.dll","BlazorStyled.pdb","Sample.pdb"],"cssReferences":[],"jsReferences":["_content/BlazorStyled/stlyed.js"],"linkerEnabled":true}
		{"main":"Sample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorStyled.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.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","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.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorStyled.pdb","Sample.pdb"],"cssReferences":[],"jsReferences":["_content\u002fBlazorStyled\u002fstlyed.js"],"linkerEnabled":true}
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ @@
             </div>
         </div>
-    @functions {
+    @code {
         private string container, navColumn, mainColumn, topNav, topMain, bottom, brand, ul, li;
         protected override async Task OnInitAsync()
@@ Expand Down @@