Skip to content

Commit 8c25c63

Browse files
committed
1.0.0-preview9-01
1 parent 162fc4f commit 8c25c63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+207
-204
lines changed
-512 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.

docs/_framework/_bin/BlazorStyled.dll

8.5 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.
512 Bytes
Binary file not shown.

docs/_framework/_bin/SamplePages.dll

512 Bytes
Binary file not shown.

docs/_framework/_bin/SamplePages.pdb

12 Bytes
Binary file not shown.

docs/_framework/_bin/System.Core.dll

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 KB
Binary file not shown.

docs/_framework/_bin/System.dll

5.5 KB
Binary file not shown.

docs/_framework/_bin/mscorlib.dll

1.5 KB
Binary file not shown.

docs/_framework/blazor.boot.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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}
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.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}

docs/_framework/blazor.server.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_framework/blazor.webassembly.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_framework/wasm/mono.js

Lines changed: 159 additions & 166 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_framework/wasm/mono.wasm

2.29 KB
Binary file not shown.

src/BlazorPrettyCode/BlazorPrettyCode.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<LangVersion>7.3</LangVersion>
77
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
88
<PackageId>BlazorPrettyCode</PackageId>
9-
<Version>1.0.0-preview8-08</Version>
9+
<Version>1.0.0-preview9-01</Version>
1010
<Authors>Chanan Braunstein</Authors>
1111
<Title>Blazor PrettyCode</Title>
1212
<Description>Razor Code Display Component</Description>
@@ -15,9 +15,11 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="BlazorStyled" Version="1.0.0-preview8-04" />
19-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview8.19405.7" />
20-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
18+
19+
<PackageReference Include="BlazorStyled" Version="1.0.0-preview9-01" />
20+
21+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview9.19424.4" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
2123
</ItemGroup>
2224

2325
<ItemGroup>

src/BlazorPrettyCode/CodeThemeSwitcher.razor

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
@inject IDefaultSettings DefaultSettings
1+
@using Microsoft.AspNetCore.Components.Web
2+
@inject IDefaultSettings DefaultSettings
23

3-
<select value="@theme" @onchange="@OnChangeTheme">
4-
<option value="PrettyCodeDefault">Default</option>
5-
<option value="GithubPlus">Github Plus</option>
6-
<option value="Material">Material</option>
7-
<option value="SolarizedDark">Solarized Dark</option>
8-
<option value="SolarizedLight">Solarized Light</option>
9-
<option value="WinterIsComingDark">Winter is Coming Dark</option>
10-
<option value="WinterIsComingLight">Winter is Coming Light</option>
11-
</select>
4+
<select value="@theme" @onchange="OnChangeTheme">
5+
<option value="PrettyCodeDefault">Default</option>
6+
<option value="GithubPlus">Github Plus</option>
7+
<option value="Material">Material</option>
8+
<option value="SolarizedDark">Solarized Dark</option>
9+
<option value="SolarizedLight">Solarized Light</option>
10+
<option value="WinterIsComingDark">Winter is Coming Dark</option>
11+
<option value="WinterIsComingLight">Winter is Coming Light</option>
12+
</select>
1213

1314
@code {
1415
//TODO: Change this to use reflection instead of hard coding classes
@@ -19,7 +20,7 @@
1920
theme = DefaultSettings.DefaultTheme;
2021
}
2122

22-
protected void OnChangeTheme(UIChangeEventArgs e)
23+
protected void OnChangeTheme(ChangeEventArgs e)
2324
{
2425
theme = (string)e.Value;
2526
DefaultSettings.DefaultTheme = theme;

src/BlazorPrettyCode/PrettyCode.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
using CSHTMLTokenizer;
55
using CSHTMLTokenizer.Tokens;
66
using Microsoft.AspNetCore.Components;
7-
using Microsoft.AspNetCore.Components.RenderTree;
7+
using Microsoft.AspNetCore.Components.Rendering;
8+
using Microsoft.AspNetCore.Components.Web;
89
using System;
910
using System.Collections.Generic;
1011
using System.Linq;
@@ -628,7 +629,7 @@ private void BuildRenderTitle(RenderTreeBuilder builderTitle)
628629
{
629630
builderTitle.OpenElement(Next(), "span");
630631
builderTitle.AddAttribute(Next(), "class", _baseCollapse);
631-
builderTitle.AddAttribute(3, "onclick", EventCallback.Factory.Create<UIMouseEventArgs>(this, OnClick));
632+
builderTitle.AddAttribute(3, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnClick));
632633
builderTitle.AddContent(Next(), _isCollapsed ? "Expand source" : "Collapse source");
633634
builderTitle.CloseElement();
634635
}

src/BlazorPrettyCode/Themes/ThemeCache.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using BlazorPrettyCode.Internal;
22
using System;
33
using System.Collections.Concurrent;
4-
using System.Threading;
54
using System.Threading.Tasks;
65

76
namespace BlazorPrettyCode.Themes

src/Sample/ClientSideSample.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
12-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview8.19405.7" />
14-
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
12+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
14+
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/Sample/_Imports.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using System.Net.Http
22
@using Microsoft.AspNetCore.Components.Forms
33
@using Microsoft.AspNetCore.Components.Routing
4+
@using Microsoft.AspNetCore.Components.Web
45
@using BlazorPrettyCode
56
@using BlazorStyled
67
@using Polished

src/SamplePages/App.razor

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<Router AppAssembly="typeof(App).Assembly">
2-
<NotFoundContent>
3-
<p>Sorry, there's nothing at this address.</p>
4-
</NotFoundContent>
2+
<Found Context="routeData">
3+
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
4+
</Found>
5+
<NotFound>
6+
<LayoutView Layout="@typeof(MainLayout)">
7+
<p>Sorry, there's nothing at this address.</p>
8+
</LayoutView>
9+
</NotFound>
510
</Router>

src/SamplePages/Pages/_Imports.razor

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/SamplePages/SamplePages.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BlazorTypography" Version="1.0.0-preview8-04" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview8.19405.7" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
9+
<PackageReference Include="BlazorTypography" Version="1.0.0-preview9-01" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview9.19424.4" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

src/SamplePages/_Imports.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using System.Net.Http
22
@using Microsoft.AspNetCore.Components.Forms
33
@using Microsoft.AspNetCore.Components.Routing
4+
@using Microsoft.AspNetCore.Components.Web
45
@using Microsoft.JSInterop
56
@using SamplePages
67
@using SamplePages.Shared

src/ServerSideSample/Pages/_Host.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
1010
<title>Blazor Pretty Code Server Side Sample</title>
1111
<base href="~/" />
12-
@(await Html.RenderComponentAsync<BlazorStyled.ServerSideStyled>())
12+
@(await Html.RenderComponentAsync<BlazorStyled.ServerSideStyled>(RenderMode.Server))
1313
</head>
1414
<body>
15-
<app>@(await Html.RenderComponentAsync<SamplePages.App>())</app>
15+
<app>@(await Html.RenderComponentAsync<SamplePages.App>(RenderMode.Server))</app>
1616

1717
<script src="_framework/blazor.server.js"></script>
1818
</body>

src/ServerSideSample/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void ConfigureServices(IServiceCollection services)
3636
services.AddScoped<HttpClient>(s =>
3737
{
3838
// Creating the URI helper needs to wait until the JS Runtime is initialized, so defer it.
39-
IUriHelper uriHelper = s.GetRequiredService<IUriHelper>();
39+
NavigationManager navigationManager = s.GetRequiredService<NavigationManager>();
4040
return new HttpClient
4141
{
42-
BaseAddress = new Uri(uriHelper.GetBaseUri())
42+
BaseAddress = new Uri(navigationManager.BaseUri)
4343
};
4444
});
4545
}

src/ServerSideSample/_Imports.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using System.Net.Http
22
@using Microsoft.AspNetCore.Components.Forms
33
@using Microsoft.AspNetCore.Components.Routing
4+
@using Microsoft.AspNetCore.Components.Web
45
@using Microsoft.JSInterop
56
@using ServerSideSample
67
@using BlazorPrettyCode

0 commit comments

Comments
 (0)