From b5bdc8810914a53e4d4c48db9f48fb9c76ff49a9 Mon Sep 17 00:00:00 2001
From: Robert Muehsig <robert.muehsig@codeinside.eu>
Date: Sun, 15 Oct 2017 22:43:35 +0200
Subject: [PATCH] naming changes to electron.manifest.json

---
 ElectronNET.CLI/Commands/BuildCommand.cs                  | 6 +++---
 ElectronNET.CLI/Commands/InitCommand.cs                   | 2 +-
 ElectronNET.CLI/Commands/StartElectronCommand.cs          | 6 +++---
 ElectronNET.CLI/ElectronNET.CLI.csproj                    | 6 ++++--
 ElectronNET.CLI/EmbeddedFileHelper.cs                     | 8 +++++++-
 .../electron.manifest.json                                | 0
 ElectronNET.Host/main.js                                  | 2 +-
 ElectronNET.WebApp/ElectronNET.WebApp.csproj              | 5 ++---
 .../{electronnet.json => electron.manifest.json}          | 0
 9 files changed, 21 insertions(+), 14 deletions(-)
 rename ElectronNET.CLI/electronnet.json => ElectronNET.Host/electron.manifest.json (100%)
 rename ElectronNET.WebApp/{electronnet.json => electron.manifest.json} (100%)

diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs
index 682e07a..650032d 100644
--- a/ElectronNET.CLI/Commands/BuildCommand.cs
+++ b/ElectronNET.CLI/Commands/BuildCommand.cs
@@ -51,9 +51,9 @@ namespace ElectronNET.CLI.Commands
                     Directory.CreateDirectory(tempPath);
                 }
 
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "main.js", "ElectronHost.");
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package.json", "ElectronHost.");
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package-lock.json", "ElectronHost.");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "main.js");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package.json");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package-lock.json");
 
                 string hostApiFolder = Path.Combine(tempPath, "api");
                 if (Directory.Exists(hostApiFolder) == false)
diff --git a/ElectronNET.CLI/Commands/InitCommand.cs b/ElectronNET.CLI/Commands/InitCommand.cs
index 6cfbfe1..08fffb9 100644
--- a/ElectronNET.CLI/Commands/InitCommand.cs
+++ b/ElectronNET.CLI/Commands/InitCommand.cs
@@ -15,7 +15,7 @@ namespace ElectronNET.CLI.Commands
         public const string COMMAND_ARGUMENTS = "<Path> from ASP.NET Core Project.";
         public static IList<CommandOption> CommandOptions { get; set; } = new List<CommandOption>();
 
-        private const string ConfigName = "electronnet.json";
+        private const string ConfigName = "electron.manifest.json";
 
         public Task<bool> ExecuteAsync()
         {
diff --git a/ElectronNET.CLI/Commands/StartElectronCommand.cs b/ElectronNET.CLI/Commands/StartElectronCommand.cs
index 1bf7231..474e1da 100644
--- a/ElectronNET.CLI/Commands/StartElectronCommand.cs
+++ b/ElectronNET.CLI/Commands/StartElectronCommand.cs
@@ -49,9 +49,9 @@ namespace ElectronNET.CLI.Commands
                 string tempBinPath = Path.Combine(tempPath, "bin");
                 ProcessHelper.CmdExecute($"dotnet publish -r win10-x64 --output \"{tempBinPath}\"", aspCoreProjectPath);
 
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "main.js", "ElectronHost.");
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package.json", "ElectronHost.");
-                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package-lock.json", "ElectronHost.");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "main.js");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package.json");
+                EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package-lock.json");
 
                 string hostApiFolder = Path.Combine(tempPath, "api");
                 if (Directory.Exists(hostApiFolder) == false)
diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj
index ed3a5a0..8702f57 100644
--- a/ElectronNET.CLI/ElectronNET.CLI.csproj
+++ b/ElectronNET.CLI/ElectronNET.CLI.csproj
@@ -15,7 +15,10 @@
   <ItemGroup>
     <None Remove="ElectronHost\package-lock.json" />
     <None Remove="ElectronHost\package.json" />
-    <None Remove="electronnet.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="..\ElectronNET.Host\electron.manifest.json" Link="ElectronHost\electron.manifest.json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,7 +28,6 @@
 
   <ItemGroup>
     <EmbeddedResource Include="..\ElectronNET.Host\main.js" Link="ElectronHost\main.js" />
-    <EmbeddedResource Include="electronnet.json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ElectronNET.CLI/EmbeddedFileHelper.cs b/ElectronNET.CLI/EmbeddedFileHelper.cs
index aa405e3..9af2e1a 100644
--- a/ElectronNET.CLI/EmbeddedFileHelper.cs
+++ b/ElectronNET.CLI/EmbeddedFileHelper.cs
@@ -15,11 +15,17 @@ namespace ElectronNET.CLI
 
             return asm.GetManifestResourceStream(resource);
         }
+
         public static void DeployEmbeddedFile(string targetPath, string file, string namespacePath = "")
         {
             using (var fileStream = File.Create(Path.Combine(targetPath, file)))
             {
-                var streamFromEmbeddedFile = GetTestResourceFileStream(namespacePath + file);
+                var streamFromEmbeddedFile = GetTestResourceFileStream("ElectronHost." + namespacePath + file);
+                if (streamFromEmbeddedFile == null)
+                {
+                    Console.WriteLine("Error: Couldn't find embedded file: " + file);
+                }
+
                 streamFromEmbeddedFile.CopyTo(fileStream);
             }
         }
diff --git a/ElectronNET.CLI/electronnet.json b/ElectronNET.Host/electron.manifest.json
similarity index 100%
rename from ElectronNET.CLI/electronnet.json
rename to ElectronNET.Host/electron.manifest.json
diff --git a/ElectronNET.Host/main.js b/ElectronNET.Host/main.js
index b189e66..3437150 100644
--- a/ElectronNET.Host/main.js
+++ b/ElectronNET.Host/main.js
@@ -33,7 +33,7 @@ function startAspCoreBackend(electronPort) {
         loadURL = `http://localhost:${electronWebPort}`
         const parameters = [`/electronPort=${electronPort}`, `/electronWebPort=${electronWebPort}`];
 
-        const manifestFile = require("./bin/electronnet.json");
+        const manifestFile = require("./bin/electron.manifest.json");
         let binaryFile = manifestFile.executable;
         
         const os = require("os");
diff --git a/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index a1ae41d..a3bbb00 100644
--- a/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -22,7 +22,6 @@
   <ItemGroup>
     <DotNetCliToolReference Include="ElectronNET.CLI" Version="*" />
   </ItemGroup>
-  
   <ItemGroup>
     <None Update="Assets\electron.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -32,8 +31,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Update="electronnet.json">
+    <Content Update="electron.manifest.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ElectronNET.WebApp/electronnet.json b/ElectronNET.WebApp/electron.manifest.json
similarity index 100%
rename from ElectronNET.WebApp/electronnet.json
rename to ElectronNET.WebApp/electron.manifest.json