Skip to content

Commit 5cd11a8

Browse files
committed
build
1 parent b3bb3ce commit 5cd11a8

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

ElectronNET.API/ElectronNET.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This package contains the API to access the "native" electron API.</Description>
1818
<PackageTags>electron aspnetcore</PackageTags>
1919
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
2020
<PackageIcon>PackageIcon.png</PackageIcon>
21-
<Version>1.0.0.0</Version>
21+
<Version>99.0.0.0</Version>
2222
</PropertyGroup>
2323

2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

ElectronNET.CLI/Commands/BuildCommand.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ public Task<bool> ExecuteAsync()
111111
{
112112
// Works proper on Windows...
113113
ProcessHelper.CmdExecute("npm install electron-builder --global", tempPath);
114-
115114
}
116115
else
117116
{
@@ -129,8 +128,8 @@ public Task<bool> ExecuteAsync()
129128
string hosthookDir = Path.Combine(tempPath, "ElectronHostHook");
130129
DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "node_modules" });
131130

132-
Console.WriteLine("Start npm install for hosthooks...");
133-
ProcessHelper.CmdExecute("npm install typescript --global", tempPath);
131+
Console.WriteLine("Start npm install for typescript & hosthooks...");
132+
ProcessHelper.CmdExecute("npm install -g typescript", hosthookDir);
134133
ProcessHelper.CmdExecute("npm install --production", hosthookDir);
135134

136135
// ToDo: Global TypeScript installation is needed for ElectronHostHook

ElectronNET.CLI/Commands/StartElectronCommand.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public Task<bool> ExecuteAsync()
7676
string hosthookDir = Path.Combine(tempPath, "ElectronHostHook");
7777
DirectoryCopy.Do(electronhosthookDir, hosthookDir, true, new List<string>() { "node_modules" });
7878

79-
Console.WriteLine("Start npm install for hosthooks...");
79+
Console.WriteLine("Start npm install for typescript & hosthooks...");
80+
ProcessHelper.CmdExecute("npm install -g typescript", hosthookDir);
8081
ProcessHelper.CmdExecute("npm install", hosthookDir);
8182

8283
string tscPath = Path.Combine(tempPath, "node_modules", ".bin");

ElectronNET.CLI/ElectronNET.CLI.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<PackageOutputPath>..\artifacts</PackageOutputPath>
1111
<PackageId>ElectronNET.CLI</PackageId>
12-
<Version>1.0.0.0</Version>
12+
<!-- Version 99 is just set for local development stuff to avoid a conflict with "real" packages on NuGet.org -->
13+
<Version>99.0.0.0</Version>
1314
<Authors>Gregor Biswanger, Robert Muehsig</Authors>
1415
<Product>Electron.NET</Product>
1516
<Company />

buildAll.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ dotnet tool uninstall ElectronNET.CLI -g
2222
dotnet tool install ElectronNET.CLI -g
2323

2424
echo "/target xxx (dev-build)"
25-
electronize build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params " "
25+
electronize build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params "--publish never"
2626

2727
echo "/target win (dev-build)"
28-
electronize build /target win
28+
electronize build /target win /electron-params "--publish never"
2929

3030
echo "/target linux (dev-build)"
31-
electronize build /target linux
31+
electronize build /target linux /electron-params "--publish never"
3232

3333
echo "/target custom win7-x86;win (dev-build)"
34-
electronize build /target custom win7-x86;win
34+
electronize build /target custom win7-x86;win /electron-params "--publish never"
3535

3636

3737
:: Be aware, that for non-electronnet-dev environments the correct

0 commit comments

Comments
 (0)