diff --git a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
index 5fedab20..c61fd39c 100644
--- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
+++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
@@ -70,7 +70,7 @@
-
+
diff --git a/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj b/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
index ad9d60c3..4d2acf56 100644
--- a/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
+++ b/src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
@@ -3,6 +3,7 @@
true
+ True
diff --git a/src/ElectronNET.Samples.AuthMiddleware/Components/App.razor b/src/ElectronNET.Samples.AuthMiddleware/Components/App.razor
index c5a59bab..ae4564bb 100644
--- a/src/ElectronNET.Samples.AuthMiddleware/Components/App.razor
+++ b/src/ElectronNET.Samples.AuthMiddleware/Components/App.razor
@@ -8,7 +8,7 @@
-
+
diff --git a/src/ElectronNET.Samples.AuthMiddleware/Components/Layout/NavMenu.razor b/src/ElectronNET.Samples.AuthMiddleware/Components/Layout/NavMenu.razor
index 56908845..1fe8790d 100644
--- a/src/ElectronNET.Samples.AuthMiddleware/Components/Layout/NavMenu.razor
+++ b/src/ElectronNET.Samples.AuthMiddleware/Components/Layout/NavMenu.razor
@@ -1,6 +1,6 @@
diff --git a/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj b/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj
index b7222217..2edceacb 100644
--- a/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj
+++ b/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj
@@ -14,7 +14,7 @@
true
ElectronHostHook/tsconfig.json
true
- true
+ false
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index 25a728fc..b4cd9e1b 100644
--- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -76,8 +76,8 @@
-
-
+
+
diff --git a/src/ElectronNET/build/ElectronNET.LateImport.targets b/src/ElectronNET/build/ElectronNET.LateImport.targets
index 0c7f5218..46ccd062 100644
--- a/src/ElectronNET/build/ElectronNET.LateImport.targets
+++ b/src/ElectronNET/build/ElectronNET.LateImport.targets
@@ -177,9 +177,12 @@
+
+ Exclude="$(ElectronSourceFilesPath)\**\build-helper.js;$(ElectronSourceFilesPath)\**\tsconfig.json" />
@@ -213,6 +216,35 @@
+
+
+
+
+
+ $(ElectronDirName)\ElectronHostHook\%(RecursiveDir)%(FileName)%(Extension)
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -231,13 +263,45 @@
+
+
+
+
+ false
+ true
+ <_NpmCmd>npm install
+ <_NpmCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpmCmd)'
+
+
+
+
+
+
+
+
+
- $(ElectronDirName)\%(DestinationRelativePath)
- $(ElectronDirName)\%(DestinationRelativePath)
+ $(ElectronDirName)\ElectronHostHook\%(Filename)%(Extension)
+ $(ElectronDirName)\ElectronHostHook\%(Filename)%(Extension)
+ $(ElectronDirName)\ElectronHostHook\%(Filename)%(Extension)
PreserveNewest
@@ -449,6 +513,10 @@
$(_OriginalPublishDir)
$(_NonIntermediatePublishDir)
$(_OriginalPublishDir)
+
+ $(ElectronPublishDir)app\
@@ -489,7 +557,7 @@ For more information, see: https://github.com/ElectronNET/Electron.NET/wiki/Migr
- $(ElectronPublishDir)%(RecursiveDir)%(FileName)%(Extension)
+ $(ElectronAppDir)%(RecursiveDir)%(FileName)%(Extension)
@@ -503,14 +571,55 @@ For more information, see: https://github.com/ElectronNET/Electron.NET/wiki/Migr
$([System.IO.Path]::GetFullPath('$(PublishUrl.TrimEnd("\"))'))
+
+ $([System.IO.Path]::GetFullPath('$(ElectronAppDir)'))
+
+
false
true
- <_NpmCmd>npm install electron-builder@$(ElectronBuilderVersion) --save-dev
- <_NpmCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpmCmd)'
+
+
+
+
+ <_NpmAppDepsCmd>npm install --omit=dev
+ <_NpmAppDepsCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpmAppDepsCmd)'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_NpmCmd>npm install electron-builder@$(ElectronBuilderVersion)
+ <_NpmCmd Condition="'$(IsLinuxWsl)' == 'true'">wsl bash -ic '$(_NpmCmd)'
+
@@ -529,6 +638,10 @@ For more information, see: https://github.com/ElectronNET/Electron.NET/wiki/Migr
$(ElectronPaParams) -c.buildVersion "$(Version)"
$(ElectronPaParams) -c.copyright "$(Copyright)"
$(ElectronPaParams) -c.extraResources "bin/**/*"
+
+ $(ElectronPaParams) -c.directories.app "app"
diff --git a/src/ElectronNET/build/package.dev.template.json b/src/ElectronNET/build/package.dev.template.json
new file mode 100644
index 00000000..86376be5
--- /dev/null
+++ b/src/ElectronNET/build/package.dev.template.json
@@ -0,0 +1,19 @@
+{
+ "name": "electron-builder-host",
+ "version": "$(Version)",
+ "private": true,
+ "build": {
+ "appId": "$(ElectronPackageId)",
+ "linux": {
+ "desktop": {
+ "entry": { "Name": "$(Title)" }
+ },
+ "executableName": "$(ElectronPackageId)"
+ },
+ "deb": {
+ "desktop": {
+ "entry": { "Name": "$(Title)" }
+ }
+ }
+ }
+}
diff --git a/src/ElectronNET/build/package.template.json b/src/ElectronNET/build/package.template.json
index fa5bca12..2f9aa6a3 100644
--- a/src/ElectronNET/build/package.template.json
+++ b/src/ElectronNET/build/package.template.json
@@ -1,20 +1,6 @@
{
"name": "$(ElectronPackageId)",
"productName": "$(ElectronTitle)",
- "build": {
- "appId": "$(ElectronPackageId)",
- "linux": {
- "desktop": {
- "entry": { "Name": "$(Title)" }
- },
- "executableName": "$(ElectronPackageId)"
- },
- "deb": {
- "desktop": {
- "entry": { "Name": "$(Title)" }
- }
- }
- },
"description": "$(Description)",
"version": "$(Version)",
"main": "main.js",