Skip to content

Commit f919289

Browse files
FlorianRapplFlorianRappl
committed
Switched default to true
1 parent 2c544a8 commit f919289

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

‎src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- When this is enabled, the project will be switched from nuget packages to consuming the ElectronNet orchestration directly -->
5-
<ElectronNetDevMode>False</ElectronNetDevMode>
5+
<ElectronNetDevMode>true</ElectronNetDevMode>
66
</PropertyGroup>
77

88
<Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
@@ -15,7 +15,7 @@
1515
<IsPackable>false</IsPackable>
1616
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
1717
<PublishTrimmed>False</PublishTrimmed>
18-
<NuGetAudit>False</NuGetAudit>
18+
<NuGetAudit>false</NuGetAudit>
1919
</PropertyGroup>
2020
<PropertyGroup Label="ElectronNetCommon">
2121
<PackageIcon>128.png</PackageIcon>
@@ -33,7 +33,7 @@
3333
<ElectronSplashScreen></ElectronSplashScreen>
3434
<License>MIT</License>
3535
<TypeScriptModuleKind>commonjs</TypeScriptModuleKind>
36-
<ElectronSingleInstance>False</ElectronSingleInstance>
36+
<ElectronSingleInstance>false</ElectronSingleInstance>
3737
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
3838
</PropertyGroup>
3939
<ItemGroup>
@@ -69,7 +69,7 @@
6969
<ProjectReference Include="..\ElectronNET.API\ElectronNET.API.csproj" Condition="$(ElectronNetDevMode)" />
7070
</ItemGroup>
7171
<ItemGroup>
72-
<PackageReference Include="ElectronNET.Core" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'True'" />
72+
<PackageReference Include="ElectronNET.Core" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
7373
</ItemGroup>
7474

7575
<Import Project="..\ElectronNET\build\ElectronNET.targets" Condition="$(ElectronNetDevMode)" />

‎src/ElectronNET.WebApp/ElectronNET.WebApp.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- When this is enabled, the project will be switched from nuget packages to consuming the ElectronNet orchestration directly -->
5-
<ElectronNetDevMode>False</ElectronNetDevMode>
5+
<ElectronNetDevMode>true</ElectronNetDevMode>
66
</PropertyGroup>
77

88
<Import Project="..\ElectronNET\build\ElectronNET.props" Condition="$(ElectronNetDevMode)" />
@@ -15,8 +15,8 @@
1515
<PropertyGroup>
1616
<IsPackable>false</IsPackable>
1717
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
18-
<PublishTrimmed>False</PublishTrimmed>
19-
<NuGetAudit>False</NuGetAudit>
18+
<PublishTrimmed>false</PublishTrimmed>
19+
<NuGetAudit>false</NuGetAudit>
2020
</PropertyGroup>
2121
<PropertyGroup Label="ElectronNetCommon">
2222
<PackageIcon>128.png</PackageIcon>
@@ -33,7 +33,7 @@
3333
<ElectronVersion>30.4.0</ElectronVersion>
3434
<ElectronSplashScreen>wwwroot\assets\img\about@2x.png</ElectronSplashScreen>
3535
<License>MIT</License>
36-
<ElectronSingleInstance>False</ElectronSingleInstance>
36+
<ElectronSingleInstance>false</ElectronSingleInstance>
3737
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
3838
<ElectronBuilderVersion>26.0</ElectronBuilderVersion>
3939
</PropertyGroup>
@@ -71,8 +71,8 @@
7171
<ProjectReference Include="..\ElectronNET.AspNet\ElectronNET.AspNet.csproj" Condition="$(ElectronNetDevMode)" />
7272
</ItemGroup>
7373
<ItemGroup>
74-
<PackageReference Include="ElectronNET.Core" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'True'" />
75-
<PackageReference Include="ElectronNET.Core.AspNet" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'True'" />
74+
<PackageReference Include="ElectronNET.Core" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
75+
<PackageReference Include="ElectronNET.Core.AspNet" Version="0.1.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
7676
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
7777
</ItemGroup>
7878

‎src/ElectronNET.WebApp/Views/About/Index.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<section class="about-section play-along">
99
<h2>Play Along</h2>
1010
<p>Use the demo snippets in an Electron app of your own. The <a href="https://github.com/electron/electron-quick-start">Electron Quick Start<span class="u-visible-to-screen-reader">(opens in new window)</span></a> app is a bare-bones setup that pairs with these demos. Follow the instructions here to get it going.
11-
To activate Electron.NET include the <a href="https://www.nuget.org/packages/ElectronNET.API/" target="_blank">ElectronNET.API NuGet package</a> in your ASP.NET Core app.
11+
To activate Electron.NET include the <a href="https://www.nuget.org/packages/ElectronNET.Core/" target="_blank">ElectronNET.API NuGet package</a> in your ASP.NET Core app.
1212
<p>
13-
<code class="language-bash">dotnet add package ElectronNET.API</code>
13+
<code class="language-bash">dotnet add package ElectronNET.Core</code>
1414
</p>
1515

1616
Then include the UseElectron WebHostBuilder-Extension into the Program.cs-file of your ASP.NET Core project.
@@ -20,7 +20,7 @@
2020
{
2121
return WebHost.CreateDefaultBuilder(args)
2222
.UseElectron(args)
23-
.UseStartup<Startup>()
23+
.UseStartup&lt;Startup&gt;()
2424
.Build();
2525
}</code>
2626
</pre>

‎src/ElectronNET.WebApp/Views/HostHook/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
};
4343
var folderPath = await Electron.Dialog.ShowOpenDialogAsync(mainWindow, options);
4444

45-
var resultFromTypeScript = await Electron.HostHook.CallAsync<string>("create-excel-file", folderPath);
45+
var resultFromTypeScript = await Electron.HostHook.CallAsync&lt;string&gt;("create-excel-file", folderPath);
4646
Electron.IpcMain.Send(mainWindow, "excel-file-created", resultFromTypeScript);
4747
});</code>
4848
</pre>

‎src/ElectronNET/build/ElectronNET.Build.dll‎

0 Bytes
Binary file not shown.

‎src/ElectronNET/build/ElectronNET.LateImport.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<UsingTask TaskName="ElectronNET.Build.RemoveEnvironmentVariables"
1212
AssemblyFile="$(MSBuildThisFileDirectory)ElectronNET.Build.dll" />
1313

14-
1514
<!-- Adjust the properties of items in the ElectronHostHook folder (if present) -->
1615

1716
<ItemGroup>
@@ -42,7 +41,7 @@
4241

4342
<!-- Create variables for our output paths -->
4443
<PropertyGroup>
45-
<ElectronSourceFilesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\xxxxElectronNET.Host'))</ElectronSourceFilesPath>
44+
<ElectronSourceFilesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\ElectronNET.Host'))</ElectronSourceFilesPath>
4645
<ElectronSourceFilesPath Condition="!Exists($(ElectronSourceFilesPath))">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\.electron'))</ElectronSourceFilesPath>
4746
<ElectronDirName>.electron</ElectronDirName>
4847
<ElectronSplashScreenFileName Condition="'$(ElectronSplashScreen)' != ''">$([System.IO.Path]::GetFileName($(ElectronSplashScreen)))</ElectronSplashScreenFileName>

‎src/ElectronNET/build/ElectronNET.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<PropertyGroup Condition="'$(ElectronExecutable)' == ''">
4+
<PropertyGroup Condition="'$(ElectronExecutable)' == ''">
55
<WinPrefix>win</WinPrefix>
6-
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
7-
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
6+
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' == 'true'">$(Title)</ElectronExecutable>
7+
<ElectronExecutable Condition="'$(RuntimeIdentifier.StartsWith($(WinPrefix)))' != 'true'">$(PackageId)</ElectronExecutable>
88
</PropertyGroup>
99

1010
<PropertyGroup>
1111
<_IsMsAspNetProject>False</_IsMsAspNetProject>
12-
<_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
12+
<_IsMsAspNetProject Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true'">True</_IsMsAspNetProject>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)