Skip to content

Commit b107244

Browse files
FlorianRapplFlorianRappl
committed
Review corrections
1 parent 14cba04 commit b107244

File tree

4 files changed

+3
-111
lines changed

4 files changed

+3
-111
lines changed

‎src/ElectronNET.Host/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function getForwardedArgs() {
149149

150150
const forwardedArgs = getForwardedArgs();
151151

152-
app.on('ready', async () => {
152+
app.on('ready', () => {
153153
// Fix ERR_UNKNOWN_URL_SCHEME using file protocol
154154
// https://github.com/electron/electron/issues/23757
155155
////protocol.registerFileProtocol('file', (request, callback) => {
@@ -172,7 +172,7 @@ app.on('ready', async () => {
172172

173173
app.on('quit', async (event, exitCode) => {
174174
// Clean up Socket.IO resources (legacy mode only)
175-
if (typeof server !== 'undefined' && server) {
175+
if (server) {
176176
try {
177177
server.close();
178178
server.closeAllConnections();

‎src/ElectronNET.sln‎

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 18
43
VisualStudioVersion = 18.0.11205.157
54
MinimumVisualStudioVersion = 10.0.40219.1
@@ -80,146 +79,54 @@ EndProject
8079
Global
8180
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8281
Debug|Any CPU = Debug|Any CPU
83-
Debug|x64 = Debug|x64
84-
Debug|x86 = Debug|x86
8582
Release|Any CPU = Release|Any CPU
86-
Release|x64 = Release|x64
87-
Release|x86 = Release|x86
8883
EndGlobalSection
8984
GlobalSection(ProjectConfigurationPlatforms) = postSolution
9085
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9186
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|Any CPU.Build.0 = Debug|Any CPU
92-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|x64.ActiveCfg = Debug|Any CPU
93-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|x64.Build.0 = Debug|Any CPU
94-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|x86.ActiveCfg = Debug|Any CPU
95-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Debug|x86.Build.0 = Debug|Any CPU
9687
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|Any CPU.ActiveCfg = Release|Any CPU
9788
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|Any CPU.Build.0 = Release|Any CPU
98-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|x64.ActiveCfg = Release|Any CPU
99-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|x64.Build.0 = Release|Any CPU
100-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|x86.ActiveCfg = Release|Any CPU
101-
{7C048379-401C-4345-B5E7-BE232DEA8157}.Release|x86.Build.0 = Release|Any CPU
10289
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10390
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
104-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|x64.ActiveCfg = Debug|Any CPU
105-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|x64.Build.0 = Debug|Any CPU
106-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|x86.ActiveCfg = Debug|Any CPU
107-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Debug|x86.Build.0 = Debug|Any CPU
10891
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
10992
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|Any CPU.Build.0 = Release|Any CPU
110-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|x64.ActiveCfg = Release|Any CPU
111-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|x64.Build.0 = Release|Any CPU
112-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|x86.ActiveCfg = Release|Any CPU
113-
{A78157BA-B754-45F1-969F-D6A513CA0E72}.Release|x86.Build.0 = Release|Any CPU
11493
{829FC339-4785-4229-ABA5-53ADB544DA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Debug|x64.ActiveCfg = Debug|Any CPU
116-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Debug|x64.Build.0 = Debug|Any CPU
117-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Debug|x86.ActiveCfg = Debug|Any CPU
118-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Debug|x86.Build.0 = Debug|Any CPU
11994
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
12095
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|Any CPU.Build.0 = Release|Any CPU
121-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|x64.ActiveCfg = Release|Any CPU
122-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|x64.Build.0 = Release|Any CPU
123-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|x86.ActiveCfg = Release|Any CPU
124-
{829FC339-4785-4229-ABA5-53ADB544DA00}.Release|x86.Build.0 = Release|Any CPU
12596
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12697
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
127-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|x64.ActiveCfg = Debug|Any CPU
128-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|x64.Build.0 = Debug|Any CPU
129-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|x86.ActiveCfg = Debug|Any CPU
130-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Debug|x86.Build.0 = Debug|Any CPU
13198
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
13299
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|Any CPU.Build.0 = Release|Any CPU
133-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|x64.ActiveCfg = Release|Any CPU
134-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|x64.Build.0 = Release|Any CPU
135-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|x86.ActiveCfg = Release|Any CPU
136-
{8860606D-6847-F22A-5AED-DF4E0984DD24}.Release|x86.Build.0 = Release|Any CPU
137100
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138101
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
139-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|x64.ActiveCfg = Debug|Any CPU
140-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|x64.Build.0 = Debug|Any CPU
141-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|x86.ActiveCfg = Debug|Any CPU
142-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Debug|x86.Build.0 = Debug|Any CPU
143102
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
144103
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|Any CPU.Build.0 = Release|Any CPU
145-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|x64.ActiveCfg = Release|Any CPU
146-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|x64.Build.0 = Release|Any CPU
147-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|x86.ActiveCfg = Release|Any CPU
148-
{DD10D21A-D131-1D9C-33F9-406046E0C5B0}.Release|x86.Build.0 = Release|Any CPU
149104
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150105
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|Any CPU.Build.0 = Debug|Any CPU
151-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|x64.ActiveCfg = Debug|Any CPU
152-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|x64.Build.0 = Debug|Any CPU
153-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|x86.ActiveCfg = Debug|Any CPU
154-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Debug|x86.Build.0 = Debug|Any CPU
155106
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|Any CPU.ActiveCfg = Release|Any CPU
156107
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|Any CPU.Build.0 = Release|Any CPU
157-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|x64.ActiveCfg = Release|Any CPU
158-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|x64.Build.0 = Release|Any CPU
159-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|x86.ActiveCfg = Release|Any CPU
160-
{EE38A326-5DE8-AF09-9EB9-DF0878938783}.Release|x86.Build.0 = Release|Any CPU
161108
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
162-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Debug|x64.ActiveCfg = Debug|Any CPU
163-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Debug|x64.Build.0 = Debug|Any CPU
164-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Debug|x86.ActiveCfg = Debug|Any CPU
165-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Debug|x86.Build.0 = Debug|Any CPU
166109
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
167-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Release|x64.ActiveCfg = Release|Any CPU
168-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Release|x64.Build.0 = Release|Any CPU
169-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Release|x86.ActiveCfg = Release|Any CPU
170-
{015CB06B-6CAE-209F-E050-21C3ACA5FE9F}.Release|x86.Build.0 = Release|Any CPU
171110
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
172-
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Debug|x64.ActiveCfg = Debug|x64
173-
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Debug|x86.ActiveCfg = Debug|x86
174111
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
175-
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Release|x64.ActiveCfg = Release|x64
176-
{06CAADC7-DE5B-47B4-AB2A-E9501459A2D1}.Release|x86.ActiveCfg = Release|x86
177112
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178113
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|Any CPU.Build.0 = Debug|Any CPU
179-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|x64.ActiveCfg = Debug|Any CPU
180-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|x64.Build.0 = Debug|Any CPU
181-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|x86.ActiveCfg = Debug|Any CPU
182-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Debug|x86.Build.0 = Debug|Any CPU
183114
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|Any CPU.ActiveCfg = Release|Any CPU
184115
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|Any CPU.Build.0 = Release|Any CPU
185-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|x64.ActiveCfg = Release|Any CPU
186-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|x64.Build.0 = Release|Any CPU
187-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|x86.ActiveCfg = Release|Any CPU
188-
{AE877E48-6B44-63C2-8EA0-DB58D096B553}.Release|x86.Build.0 = Release|Any CPU
189116
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
190117
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
191118
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
192-
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Debug|x64.ActiveCfg = Debug|x64
193-
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Debug|x86.ActiveCfg = Debug|x86
194119
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
195120
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Release|Any CPU.Build.0 = Release|Any CPU
196121
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Release|Any CPU.Deploy.0 = Release|Any CPU
197-
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Release|x64.ActiveCfg = Release|x64
198-
{1C5FD66E-A1C6-C436-DF7C-3ECE4FEDDFE6}.Release|x86.ActiveCfg = Release|x86
199122
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
200123
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|Any CPU.Build.0 = Debug|Any CPU
201-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|x64.ActiveCfg = Debug|Any CPU
202-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|x64.Build.0 = Debug|Any CPU
203-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|x86.ActiveCfg = Debug|Any CPU
204-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Debug|x86.Build.0 = Debug|Any CPU
205124
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|Any CPU.ActiveCfg = Release|Any CPU
206125
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|Any CPU.Build.0 = Release|Any CPU
207-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|x64.ActiveCfg = Release|Any CPU
208-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|x64.Build.0 = Release|Any CPU
209-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|x86.ActiveCfg = Release|Any CPU
210-
{B8D65F3A-7E54-4632-9F1C-46679237B312}.Release|x86.Build.0 = Release|Any CPU
211126
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
212127
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|Any CPU.Build.0 = Debug|Any CPU
213-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|x64.ActiveCfg = Debug|Any CPU
214-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|x64.Build.0 = Debug|Any CPU
215-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|x86.ActiveCfg = Debug|Any CPU
216-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Debug|x86.Build.0 = Debug|Any CPU
217128
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|Any CPU.ActiveCfg = Release|Any CPU
218129
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|Any CPU.Build.0 = Release|Any CPU
219-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|x64.ActiveCfg = Release|Any CPU
220-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|x64.Build.0 = Release|Any CPU
221-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|x86.ActiveCfg = Release|Any CPU
222-
{96870775-C2F7-48C4-88F0-074BE1A1D679}.Release|x86.Build.0 = Release|Any CPU
223130
EndGlobalSection
224131
GlobalSection(SolutionProperties) = preSolution
225132
HideSolutionNode = FALSE

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,19 +397,6 @@
397397

398398
<Exec Command="cmd /c del Resources &amp;&amp; mklink /D Resources &quot;Versions\Current\Resources&quot;" WorkingDirectory="%(_ElectronFrameworkDirs.Identity)" Condition="'$(ElectronPlatform)' == 'mac' AND '$(_CurrentOSPlatform)' == 'win'" />
399399

400-
<!-- Fix psl dist folder issue - copy from source if it exists -->
401-
<PropertyGroup>
402-
<_PslSourceDist>$(ElectronSourceFilesPath)\node_modules\psl\dist</_PslSourceDist>
403-
<_PslTargetDist>$(ElectronOutDir)node_modules\psl\dist</_PslTargetDist>
404-
</PropertyGroup>
405-
406-
<ItemGroup>
407-
<_PslDistFiles Include="$(_PslSourceDist)\**\*.*" Condition="Exists('$(_PslSourceDist)')" />
408-
</ItemGroup>
409-
410-
<Message Importance="High" Text="Copying psl dist folder from source" Condition="@(_PslDistFiles->Count()) > 0" />
411-
<Copy SourceFiles="@(_PslDistFiles)" DestinationFolder="$(_PslTargetDist)\%(RecursiveDir)" Condition="@(_PslDistFiles->Count()) > 0" />
412-
413400
</Target>
414401

415402
<Target Name="BeforePublishElectronApp" BeforeTargets="PrepareForPublish">

‎src/ElectronNET/build/package.template.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
"start": "tsc -p ."
3333
},
3434
"dependencies": {
35-
"@microsoft/signalr": "^8.0.7",
3635
"dasherize": "^2.0.0",
3736
"electron-updater": "^6.6.2",
3837
"image-size": "^1.2.1",
39-
"portscanner": "^2.2.0",
4038
"socket.io": "^4.8.1",
4139
"electron-host-hook": "file:./ElectronHostHook"
4240
},

0 commit comments

Comments
 (0)