diff --git a/ElectronNET.API/ElectronNET.API.csproj b/ElectronNET.API/ElectronNET.API.csproj index ffdea36..4a33f6a 100644 --- a/ElectronNET.API/ElectronNET.API.csproj +++ b/ElectronNET.API/ElectronNET.API.csproj @@ -18,7 +18,7 @@ This package contains the API to access the "native" electron API. electron aspnetcore Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md PackageIcon.png - 1.0.0.0 + 99.0.0.0 diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs index 2bbdc6c..d9eb03a 100644 --- a/ElectronNET.CLI/Commands/BuildCommand.cs +++ b/ElectronNET.CLI/Commands/BuildCommand.cs @@ -111,7 +111,6 @@ namespace ElectronNET.CLI.Commands { // Works proper on Windows... ProcessHelper.CmdExecute("npm install electron-builder --global", tempPath); - } else { @@ -129,8 +128,8 @@ namespace ElectronNET.CLI.Commands string hosthookDir = Path.Combine(tempPath, "ElectronHostHook"); DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List() { "node_modules" }); - Console.WriteLine("Start npm install for hosthooks..."); - ProcessHelper.CmdExecute("npm install typescript --global", tempPath); + Console.WriteLine("Start npm install for typescript & hosthooks..."); + ProcessHelper.CmdExecute("npm install -g typescript", hosthookDir); ProcessHelper.CmdExecute("npm install --production", hosthookDir); // ToDo: Global TypeScript installation is needed for ElectronHostHook diff --git a/ElectronNET.CLI/Commands/StartElectronCommand.cs b/ElectronNET.CLI/Commands/StartElectronCommand.cs index ee661f2..432ffb1 100644 --- a/ElectronNET.CLI/Commands/StartElectronCommand.cs +++ b/ElectronNET.CLI/Commands/StartElectronCommand.cs @@ -76,7 +76,8 @@ namespace ElectronNET.CLI.Commands string hosthookDir = Path.Combine(tempPath, "ElectronHostHook"); DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List() { "node_modules" }); - Console.WriteLine("Start npm install for hosthooks..."); + Console.WriteLine("Start npm install for typescript & hosthooks..."); + ProcessHelper.CmdExecute("npm install -g typescript", hosthookDir); ProcessHelper.CmdExecute("npm install", hosthookDir); string tscPath = Path.Combine(tempPath, "node_modules", ".bin"); diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj index d468d5b..6258c6a 100644 --- a/ElectronNET.CLI/ElectronNET.CLI.csproj +++ b/ElectronNET.CLI/ElectronNET.CLI.csproj @@ -9,7 +9,8 @@ true ..\artifacts ElectronNET.CLI - 1.0.0.0 + + 99.0.0.0 Gregor Biswanger, Robert Muehsig Electron.NET diff --git a/buildAll.cmd b/buildAll.cmd index b42a807..04a7839 100755 --- a/buildAll.cmd +++ b/buildAll.cmd @@ -22,16 +22,16 @@ dotnet tool uninstall ElectronNET.CLI -g dotnet tool install ElectronNET.CLI -g echo "/target xxx (dev-build)" -electronize build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params " " +electronize build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params "--publish never" echo "/target win (dev-build)" -electronize build /target win +electronize build /target win /electron-params "--publish never" echo "/target linux (dev-build)" -electronize build /target linux +electronize build /target linux /electron-params "--publish never" echo "/target custom win7-x86;win (dev-build)" -electronize build /target custom win7-x86;win +electronize build /target custom win7-x86;win /electron-params "--publish never" :: Be aware, that for non-electronnet-dev environments the correct