This commit is contained in:
Robert Muehsig
2019-10-03 23:36:21 +02:00
parent b3bb3ceb97
commit 5cd11a8110
5 changed files with 11 additions and 10 deletions

View File

@@ -18,7 +18,7 @@ This package contains the API to access the "native" electron API.</Description>
<PackageTags>electron aspnetcore</PackageTags> <PackageTags>electron aspnetcore</PackageTags>
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes> <PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
<PackageIcon>PackageIcon.png</PackageIcon> <PackageIcon>PackageIcon.png</PackageIcon>
<Version>1.0.0.0</Version> <Version>99.0.0.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -111,7 +111,6 @@ namespace ElectronNET.CLI.Commands
{ {
// Works proper on Windows... // Works proper on Windows...
ProcessHelper.CmdExecute("npm install electron-builder --global", tempPath); ProcessHelper.CmdExecute("npm install electron-builder --global", tempPath);
} }
else else
{ {
@@ -129,8 +128,8 @@ namespace ElectronNET.CLI.Commands
string hosthookDir = Path.Combine(tempPath, "ElectronHostHook"); string hosthookDir = Path.Combine(tempPath, "ElectronHostHook");
DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "node_modules" }); DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "node_modules" });
Console.WriteLine("Start npm install for hosthooks..."); Console.WriteLine("Start npm install for typescript & hosthooks...");
ProcessHelper.CmdExecute("npm install typescript --global", tempPath); ProcessHelper.CmdExecute("npm install -g typescript", hosthookDir);
ProcessHelper.CmdExecute("npm install --production", hosthookDir); ProcessHelper.CmdExecute("npm install --production", hosthookDir);
// ToDo: Global TypeScript installation is needed for ElectronHostHook // ToDo: Global TypeScript installation is needed for ElectronHostHook

View File

@@ -76,7 +76,8 @@ namespace ElectronNET.CLI.Commands
string hosthookDir = Path.Combine(tempPath, "ElectronHostHook"); string hosthookDir = Path.Combine(tempPath, "ElectronHostHook");
DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "node_modules" }); DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "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); ProcessHelper.CmdExecute("npm install", hosthookDir);
string tscPath = Path.Combine(tempPath, "node_modules", ".bin"); string tscPath = Path.Combine(tempPath, "node_modules", ".bin");

View File

@@ -9,7 +9,8 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>..\artifacts</PackageOutputPath> <PackageOutputPath>..\artifacts</PackageOutputPath>
<PackageId>ElectronNET.CLI</PackageId> <PackageId>ElectronNET.CLI</PackageId>
<Version>1.0.0.0</Version> <!-- Version 99 is just set for local development stuff to avoid a conflict with "real" packages on NuGet.org -->
<Version>99.0.0.0</Version>
<Authors>Gregor Biswanger, Robert Muehsig</Authors> <Authors>Gregor Biswanger, Robert Muehsig</Authors>
<Product>Electron.NET</Product> <Product>Electron.NET</Product>
<Company /> <Company />

View File

@@ -22,16 +22,16 @@ dotnet tool uninstall ElectronNET.CLI -g
dotnet tool install ElectronNET.CLI -g dotnet tool install ElectronNET.CLI -g
echo "/target xxx (dev-build)" 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)" echo "/target win (dev-build)"
electronize build /target win electronize build /target win /electron-params "--publish never"
echo "/target linux (dev-build)" 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)" 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 :: Be aware, that for non-electronnet-dev environments the correct