Skip to content

Commit 4a40d5a

Browse files
sanosdolesanosdole
authored
Merge pull request #50 from sanosdole:electron-12
Implement support for Electron 12. Major changes: - [node #30782](nodejs/node#30782) New ArrayBuffer backing store prevents reusing the same data pointer - [electron #27949](electron/electron#27949) Context isolation is turned on by default and prevents `coreclr-hosting` from working properly - [electron #18397](electron/electron#18397) & [electron #454](maximegris/angular-electron#454) lead to `app.allowRendererProcessReuse` being fixed to true on Electron 12. This required making `coreclr-hosting` context aware and implement proper re-use of the hosted CLR. Known Issues: - After reloading a renderer app the task scheduler sometimes hangs up, as the the `ThreadSafeFunction` does not get invoked. Code cleanup and small memory management improvements.
2 parents b97930a + 8e5d996 commit 4a40d5a

File tree

116 files changed

+4539
-3945
lines changed

Some content is hidden

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

116 files changed

+4539
-3945
lines changed

‎.editorconfig

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
# Code files
9+
[*.{cs,csx,vb,vbx}]
10+
indent_size = 4
11+
insert_final_newline = true
12+
charset = utf-8-bom
13+
###############################
14+
# .NET Coding Conventions #
15+
###############################
16+
[*.{cs,vb}]
17+
# Organize usings
18+
dotnet_sort_system_directives_first = true
19+
# this. preferences
20+
dotnet_style_qualification_for_field = false:silent
21+
dotnet_style_qualification_for_property = false:silent
22+
dotnet_style_qualification_for_method = false:silent
23+
dotnet_style_qualification_for_event = false:silent
24+
# Language keywords vs BCL types preferences
25+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
26+
dotnet_style_predefined_type_for_member_access = true:silent
27+
# Parentheses preferences
28+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
29+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
30+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
31+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
32+
# Modifier preferences
33+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
34+
dotnet_style_readonly_field = true:suggestion
35+
# Expression-level preferences
36+
dotnet_style_object_initializer = true:suggestion
37+
dotnet_style_collection_initializer = true:suggestion
38+
dotnet_style_explicit_tuple_names = true:suggestion
39+
dotnet_style_null_propagation = true:suggestion
40+
dotnet_style_coalesce_expression = true:suggestion
41+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
42+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
43+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
44+
dotnet_style_prefer_auto_properties = true:silent
45+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
46+
dotnet_style_prefer_conditional_expression_over_return = true:silent
47+
###############################
48+
# Naming Conventions #
49+
###############################
50+
# Style Definitions
51+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
52+
# Use PascalCase for constant fields
53+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
54+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
55+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
56+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
57+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
58+
dotnet_naming_symbols.constant_fields.required_modifiers = const
59+
###############################
60+
# C# Coding Conventions #
61+
###############################
62+
[*.cs]
63+
# var preferences
64+
csharp_style_var_for_built_in_types = true:silent
65+
csharp_style_var_when_type_is_apparent = true:silent
66+
csharp_style_var_elsewhere = true:silent
67+
# Expression-bodied members
68+
csharp_style_expression_bodied_methods = false:silent
69+
csharp_style_expression_bodied_constructors = false:silent
70+
csharp_style_expression_bodied_operators = false:silent
71+
csharp_style_expression_bodied_properties = true:silent
72+
csharp_style_expression_bodied_indexers = true:silent
73+
csharp_style_expression_bodied_accessors = true:silent
74+
# Pattern matching preferences
75+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
76+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
77+
# Null-checking preferences
78+
csharp_style_throw_expression = true:suggestion
79+
csharp_style_conditional_delegate_call = true:suggestion
80+
# Modifier preferences
81+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
82+
# Expression-level preferences
83+
csharp_prefer_braces = true:silent
84+
csharp_style_deconstructed_variable_declaration = true:suggestion
85+
csharp_prefer_simple_default_expression = true:suggestion
86+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
87+
csharp_style_inlined_variable_declaration = true:suggestion
88+
###############################
89+
# C# Formatting Rules #
90+
###############################
91+
# New line preferences
92+
csharp_new_line_before_open_brace = all
93+
csharp_new_line_before_else = true
94+
csharp_new_line_before_catch = true
95+
csharp_new_line_before_finally = true
96+
csharp_new_line_before_members_in_object_initializers = true
97+
csharp_new_line_before_members_in_anonymous_types = true
98+
csharp_new_line_between_query_expression_clauses = true
99+
# Indentation preferences
100+
csharp_indent_case_contents = true
101+
csharp_indent_switch_labels = true
102+
csharp_indent_labels = flush_left
103+
# Space preferences
104+
csharp_space_after_cast = false
105+
csharp_space_after_keywords_in_control_flow_statements = true
106+
csharp_space_between_method_call_parameter_list_parentheses = false
107+
csharp_space_between_method_declaration_parameter_list_parentheses = false
108+
csharp_space_between_parentheses = false
109+
csharp_space_before_colon_in_inheritance_clause = true
110+
csharp_space_after_colon_in_inheritance_clause = true
111+
csharp_space_around_binary_operators = before_and_after
112+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
113+
csharp_space_between_method_call_name_and_opening_parenthesis = false
114+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
115+
# Wrapping preferences
116+
csharp_preserve_single_line_statements = true
117+
csharp_preserve_single_line_blocks = true
118+
###############################
119+
# VB Coding Conventions #
120+
###############################
121+
[*.vb]
122+
# Modifier preferences
123+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

‎.travis.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
2-
node_js: 12.16.3
2+
node_js: 12.17.0
33

44
jobs:
55
include:
@@ -27,11 +27,10 @@ jobs:
2727
- npm i --build-from-source
2828
- if [ "$TRAVIS_TAG" != "" ]; then
2929
npm version "${TRAVIS_TAG:1}" --allow-same-version;
30-
prebuild -t 12.16.3--include-regex "\.(node|a|dll|so|dylib)$";
31-
prebuild -t 14.4.0 --include-regex "\.(node|a|dll|so|dylib)$";
32-
prebuild -t 8.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
33-
prebuild -t 9.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
34-
prebuild -t 10.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
30+
prebuild -t 12.17.0--include-regex "\.(node|a|dll|so|dylib)$";
31+
prebuild -t 14.0.0 --include-regex "\.(node|a|dll|so|dylib)$";
32+
prebuild -t 11.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
33+
prebuild -t 12.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
3534
fi
3635
# TODO: Why is process.env.DEBUG set when building production?
3736
- "cd ../electron-blazor-glue"
@@ -69,7 +68,8 @@ jobs:
6968
tags: true
7069

7170
- name: prebuild coreclr-hosting osx
72-
os: osx
71+
os: osx
72+
osx_image: xcode12.2
7373
addons:
7474
homebrew:
7575
update: true
@@ -85,11 +85,10 @@ jobs:
8585
- npm i --build-from-source
8686
- if [ "$TRAVIS_TAG" != "" ]; then
8787
npm version "${TRAVIS_TAG:1}" --allow-same-version;
88-
prebuild -t 12.16.3 --include-regex "\.(node|a|dll|so|dylib)$";
89-
prebuild -t 14.4.0 --include-regex "\.(node|a|dll|so|dylib)$";
90-
prebuild -t 8.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
91-
prebuild -t 9.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
92-
prebuild -t 10.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
88+
prebuild -t 12.17.0--include-regex "\.(node|a|dll|so|dylib)$";
89+
prebuild -t 14.0.0 --include-regex "\.(node|a|dll|so|dylib)$";
90+
prebuild -t 11.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
91+
prebuild -t 12.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
9392
fi
9493
script:
9594
- npm run build-testapp
@@ -116,11 +115,10 @@ jobs:
116115
- npm i --build-from-source
117116
- if [ "$TRAVIS_TAG" != "" ]; then
118117
npm version "${TRAVIS_TAG:1}" --allow-same-version;
119-
prebuild -t 12.16.3 --include-regex "\.(node|a|dll|so|dylib)$";
120-
prebuild -t 14.4.0 --include-regex "\.(node|a|dll|so|dylib)$";
121-
prebuild -t 8.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
122-
prebuild -t 9.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
123-
prebuild -t 10.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
118+
prebuild -t 12.17.0--include-regex "\.(node|a|dll|so|dylib)$";
119+
prebuild -t 14.0.0 --include-regex "\.(node|a|dll|so|dylib)$";
120+
prebuild -t 11.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
121+
prebuild -t 12.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
124122
fi
125123
script:
126124
- npm run build-testapp

‎.vscode/c_cpp_properties.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
{
44
"name": "Win32",
55
"includePath": [
6-
"${workspaceFolder}/**",
7-
"C:\\Users/Daniel/AppData/Local/node-gyp/Cache/10.15.3/**"
6+
"${workspaceFolder}/coreclr-hosting/**",
7+
"C:\\Users/Daniel/AppData/Local/node-gyp/Cache/12.16.3/**"
88
],
99
"defines": [
1010
"WINDOWS",
1111
"_DEBUG",
1212
"UNICODE",
1313
"_UNICODE",
14-
"NAPI_EXPERIMENTAL",
14+
"NAPI_VERSION=6",
1515
"NODE_ADDON_API_DISABLE_DEPRECATED",
1616
"NAPI_DISABLE_CPP_EXCEPTIONS"
1717
],
@@ -24,11 +24,11 @@
2424
{
2525
"name": "Mac",
2626
"includePath": [
27-
"${workspaceFolder}/**",
28-
"/Users/danielmartin/.node-gyp/10.16.3/include/node"
27+
"${workspaceFolder}/coreclr-hosting/**",
28+
"/Users/danielmartin/.node-gyp/12.16.3/include/node"
2929
],
3030
"defines": [
31-
"NAPI_EXPERIMENTAL",
31+
"NAPI_VERSION=6",
3232
"NODE_ADDON_API_DISABLE_DEPRECATED",
3333
"NAPI_DISABLE_CPP_EXCEPTIONS"
3434
],

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"xlocmon": "cpp",
9393
"xloctime": "cpp",
9494
"deque": "cpp",
95-
"queue": "cpp"
95+
"queue": "cpp",
96+
"optional": "cpp"
9697
}
9798
}

‎ElectronHostedBlazor/Builder/ComponentsApplicationBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public static void AddComponent<TComponent>(this IComponentsApplicationBuilder a
2424
app.AddComponent(typeof(TComponent), domElementSelector);
2525
}
2626
}
27-
}
27+
}

‎ElectronHostedBlazor/Builder/IComponentsApplicationBuilder.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
21
// Copyright (c) .NET Foundation. All rights reserved.
32
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
43
// Modified by Daniel Martin for nodeclrhost
54

6-
using System;
7-
using Microsoft.AspNetCore.Components;
8-
95
namespace ElectronHostedBlazor.Builder
106
{
7+
using System;
8+
using Microsoft.AspNetCore.Components;
9+
1110
/// <summary>
1211
/// A builder for adding components to an application.
1312
/// </summary>
@@ -27,5 +26,3 @@ public interface IComponentsApplicationBuilder
2726
void AddComponent(Type componentType, string domElementSelector);
2827
}
2928
}
30-
31-

‎ElectronHostedBlazor/ElectronHostedBlazor.csproj

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<Project ToolsVersion="14.0"
34
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
45
Sdk="Microsoft.NET.Sdk">
56

6-
<PropertyGroup>
7-
<TargetFramework>netcoreapp3.1</TargetFramework>
8-
</PropertyGroup>
9-
10-
<PropertyGroup>
11-
<PackageId>ElectronHostedBlazor</PackageId>
12-
<Version Condition="'$(TRAVIS_TAG)' == ''">0.7.9</Version>
13-
<Version Condition="'$(TRAVIS_TAG)' != ''">$(TRAVIS_TAG.Substring(1))</Version>
14-
<Authors>sanosdole2</Authors>
15-
<Company>nodeclrhost</Company>
16-
17-
<Title>Hosting ASP blazor components in electron renderer</Title>
18-
<Description>This library implements a electron renderer host for blazor components using the `NodeHostEnvironment`.</Description>
19-
<Copyright>Daniel Martin 2019</Copyright>
20-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
21-
<MinClientVersion>4.3.0</MinClientVersion>
22-
<!-- <PackageIconUrl></PackageIconUrl> -->
23-
<!-- <PackageReleaseNotes></PackageReleaseNotes> -->
24-
<PackageTags>node;javascript;interop;electron;components;blazor</PackageTags>
25-
<IncludeSymbols>true</IncludeSymbols>
26-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27-
<IncludeSource>false</IncludeSource>
28-
<IsTool>false</IsTool>
29-
<RepositoryUrl>https://github.com/sanosdole/nodeclrhost.git</RepositoryUrl>
30-
<RepositoryType>git</RepositoryType>
31-
<RepositoryBranch>master</RepositoryBranch>
32-
<!-- <RepositoryCommit></RepositoryCommit> -->
33-
34-
</PropertyGroup>
35-
36-
<ItemGroup>
37-
<ProjectReference Include="..\NodeHostEnvironment\NodeHostEnvironment.csproj" />
38-
</ItemGroup>
39-
40-
<ItemGroup>
41-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
42-
</ItemGroup>
7+
<PropertyGroup>
8+
<TargetFramework>netcoreapp3.1</TargetFramework>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
12+
<PackageId>ElectronHostedBlazor</PackageId>
13+
<Version Condition="'$(TRAVIS_TAG)' == ''">0.8.0</Version>
14+
<Version Condition="'$(TRAVIS_TAG)' != ''">$(TRAVIS_TAG.Substring(1))</Version>
15+
<Authors>sanosdole2</Authors>
16+
<Company>nodeclrhost</Company>
17+
18+
<Title>Hosting ASP blazor components in electron renderer</Title>
19+
<Description>This library implements a electron renderer host for blazor components using the `NodeHostEnvironment`.</Description>
20+
<Copyright>Daniel Martin 2019</Copyright>
21+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
22+
<MinClientVersion>4.3.0</MinClientVersion>
23+
<!-- <PackageIconUrl></PackageIconUrl> -->
24+
<!-- <PackageReleaseNotes></PackageReleaseNotes> -->
25+
<PackageTags>node;javascript;interop;electron;components;blazor</PackageTags>
26+
<IncludeSymbols>true</IncludeSymbols>
27+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
28+
<IncludeSource>false</IncludeSource>
29+
<IsTool>false</IsTool>
30+
<RepositoryUrl>https://github.com/sanosdole/nodeclrhost.git</RepositoryUrl>
31+
<RepositoryType>git</RepositoryType>
32+
<RepositoryBranch>master</RepositoryBranch>
33+
<!-- <RepositoryCommit></RepositoryCommit> -->
34+
35+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
36+
</PropertyGroup>
37+
38+
<ItemGroup>
39+
<ProjectReference Include="..\NodeHostEnvironment\NodeHostEnvironment.csproj" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
44+
</ItemGroup>
4345

4446
</Project>

‎ElectronHostedBlazor/Hosting/BlazorElectronHost.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace ElectronHostedBlazor.Hosting
66
{
7-
87
public static class BlazorElectronHost
98
{
109
/// <summary>
@@ -16,4 +15,4 @@ public static IElectronHostBuilder CreateDefaultBuilder()
1615
return new ElectronHostBuilder();
1716
}
1817
}
19-
}
18+
}

0 commit comments

Comments
 (0)