Skip to content

Commit

Permalink
Merge pull request #50 from sanosdole:electron-12
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sanosdole committed Mar 30, 2021
2 parents b97930a + 8e5d996 commit 4a40d5a
Show file tree
Hide file tree
Showing 116 changed files with 4,539 additions and 3,945 deletions.
123 changes: 123 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
###############################
# Core EditorConfig Options #
###############################
# All files
[*]
indent_style = space
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
###############################
# .NET Coding Conventions #
###############################
[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
###############################
# Naming Conventions #
###############################
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const
###############################
# C# Coding Conventions #
###############################
[*.cs]
# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
###############################
# C# Formatting Rules #
###############################
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true
# Indentation preferences
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true
###############################
# VB Coding Conventions #
###############################
[*.vb]
# Modifier preferences
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
32 changes: 15 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js: 12.16.3
node_js: 12.17.0

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

- name: prebuild coreclr-hosting osx
os: osx
os: osx
osx_image: xcode12.2
addons:
homebrew:
update: true
Expand All @@ -85,11 +85,10 @@ jobs:
- npm i --build-from-source
- if [ "$TRAVIS_TAG" != "" ]; then
npm version "${TRAVIS_TAG:1}" --allow-same-version;
prebuild -t 12.16.3 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 14.4.0 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 8.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 9.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 10.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 12.17.0--include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 14.0.0 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 11.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 12.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
fi
script:
- npm run build-testapp
Expand All @@ -116,11 +115,10 @@ jobs:
- npm i --build-from-source
- if [ "$TRAVIS_TAG" != "" ]; then
npm version "${TRAVIS_TAG:1}" --allow-same-version;
prebuild -t 12.16.3 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 14.4.0 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 8.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 9.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 10.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 12.17.0--include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 14.0.0 --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 11.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
prebuild -t 12.0.0 -r electron --include-regex "\.(node|a|dll|so|dylib)$";
fi
script:
- npm run build-testapp
Expand Down
12 changes: 6 additions & 6 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"C:\\Users/Daniel/AppData/Local/node-gyp/Cache/10.15.3/**"
"${workspaceFolder}/coreclr-hosting/**",
"C:\\Users/Daniel/AppData/Local/node-gyp/Cache/12.16.3/**"
],
"defines": [
"WINDOWS",
"_DEBUG",
"UNICODE",
"_UNICODE",
"NAPI_EXPERIMENTAL",
"NAPI_VERSION=6",
"NODE_ADDON_API_DISABLE_DEPRECATED",
"NAPI_DISABLE_CPP_EXCEPTIONS"
],
Expand All @@ -24,11 +24,11 @@
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**",
"/Users/danielmartin/.node-gyp/10.16.3/include/node"
"${workspaceFolder}/coreclr-hosting/**",
"/Users/danielmartin/.node-gyp/12.16.3/include/node"
],
"defines": [
"NAPI_EXPERIMENTAL",
"NAPI_VERSION=6",
"NODE_ADDON_API_DISABLE_DEPRECATED",
"NAPI_DISABLE_CPP_EXCEPTIONS"
],
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
"xlocmon": "cpp",
"xloctime": "cpp",
"deque": "cpp",
"queue": "cpp"
"queue": "cpp",
"optional": "cpp"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ public static void AddComponent<TComponent>(this IComponentsApplicationBuilder a
app.AddComponent(typeof(TComponent), domElementSelector);
}
}
}
}
9 changes: 3 additions & 6 deletions ElectronHostedBlazor/Builder/IComponentsApplicationBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Modified by Daniel Martin for nodeclrhost

using System;
using Microsoft.AspNetCore.Components;

namespace ElectronHostedBlazor.Builder
{
using System;
using Microsoft.AspNetCore.Components;

/// <summary>
/// A builder for adding components to an application.
/// </summary>
Expand All @@ -27,5 +26,3 @@ public interface IComponentsApplicationBuilder
void AddComponent(Type componentType, string domElementSelector);
}
}


76 changes: 39 additions & 37 deletions ElectronHostedBlazor/ElectronHostedBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="14.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<PackageId>ElectronHostedBlazor</PackageId>
<Version Condition="'$(TRAVIS_TAG)' == ''">0.7.9</Version>
<Version Condition="'$(TRAVIS_TAG)' != ''">$(TRAVIS_TAG.Substring(1))</Version>
<Authors>sanosdole2</Authors>
<Company>nodeclrhost</Company>

<Title>Hosting ASP blazor components in electron renderer</Title>
<Description>This library implements a electron renderer host for blazor components using the `NodeHostEnvironment`.</Description>
<Copyright>Daniel Martin 2019</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<MinClientVersion>4.3.0</MinClientVersion>
<!-- <PackageIconUrl></PackageIconUrl> -->
<!-- <PackageReleaseNotes></PackageReleaseNotes> -->
<PackageTags>node;javascript;interop;electron;components;blazor</PackageTags>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<IncludeSource>false</IncludeSource>
<IsTool>false</IsTool>
<RepositoryUrl>https://github.com/sanosdole/nodeclrhost.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryBranch>master</RepositoryBranch>
<!-- <RepositoryCommit></RepositoryCommit> -->

</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NodeHostEnvironment\NodeHostEnvironment.csproj" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<PackageId>ElectronHostedBlazor</PackageId>
<Version Condition="'$(TRAVIS_TAG)' == ''">0.8.0</Version>
<Version Condition="'$(TRAVIS_TAG)' != ''">$(TRAVIS_TAG.Substring(1))</Version>
<Authors>sanosdole2</Authors>
<Company>nodeclrhost</Company>

<Title>Hosting ASP blazor components in electron renderer</Title>
<Description>This library implements a electron renderer host for blazor components using the `NodeHostEnvironment`.</Description>
<Copyright>Daniel Martin 2019</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<MinClientVersion>4.3.0</MinClientVersion>
<!-- <PackageIconUrl></PackageIconUrl> -->
<!-- <PackageReleaseNotes></PackageReleaseNotes> -->
<PackageTags>node;javascript;interop;electron;components;blazor</PackageTags>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<IncludeSource>false</IncludeSource>
<IsTool>false</IsTool>
<RepositoryUrl>https://github.com/sanosdole/nodeclrhost.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryBranch>master</RepositoryBranch>
<!-- <RepositoryCommit></RepositoryCommit> -->

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NodeHostEnvironment\NodeHostEnvironment.csproj" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ElectronHostedBlazor/Hosting/BlazorElectronHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace ElectronHostedBlazor.Hosting
{

public static class BlazorElectronHost
{
/// <summary>
Expand All @@ -16,4 +15,4 @@ public static IElectronHostBuilder CreateDefaultBuilder()
return new ElectronHostBuilder();
}
}
}
}
Loading

0 comments on commit 4a40d5a

Please sign in to comment.