starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-22 06:54:44 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

naming changes to electron.manifest.json

Browse Source
This commit is contained in:
Robert Muehsig
2017-10-15 22:43:35 +02:00
parent 828963ae9f
commit b5bdc88109
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ElectronNET.CLI/Commands/BuildCommand.cs
View File

@@ -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)

2
ElectronNET.CLI/Commands/InitCommand.cs
View File

@@ -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()
{

6
ElectronNET.CLI/Commands/StartElectronCommand.cs
View File

@@ -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)

6
ElectronNET.CLI/ElectronNET.CLI.csproj
View File

@@ -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>

8
ElectronNET.CLI/EmbeddedFileHelper.cs
View File

@@ -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);
}
}

0
ElectronNET.CLI/electronnet.json → ElectronNET.Host/electron.manifest.json
View File

2
ElectronNET.Host/main.js
View File

@@ -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");

5
ElectronNET.WebApp/ElectronNET.WebApp.csproj
View File

@@ -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>

0
ElectronNET.WebApp/electronnet.json → ElectronNET.WebApp/electron.manifest.json
View File