Merge branch 'cli-etc' into develop

2026-07-10 18:58:19 +00:00 · 2017-10-16 23:29:49 +02:00
parent c1792c793f 677f355155
commit 2bace2d215
16 changed files with 80 additions and 20 deletions
--- 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>
--- a/ElectronNET.WebApp/electron.manifest.json
+++ b/ElectronNET.WebApp/electron.manifest.json