diff --git a/ElectronNET.API/ElectronNET.API.csproj b/ElectronNET.API/ElectronNET.API.csproj index 37160d1..aadac3a 100644 --- a/ElectronNET.API/ElectronNET.API.csproj +++ b/ElectronNET.API/ElectronNET.API.csproj @@ -4,15 +4,15 @@ net5.0 true ..\artifacts - h5.ElectronNET.API + ElectronNET.API Gregor Biswanger, Robert Muehsig, Rafael Oliveira Electron.NET MIT - https://github.com/theolivenbaum/Electron.NET/ + https://github.com/ElectronNet/Electron.NET/ Building cross platform electron based desktop apps with .NET Core and ASP.NET Core. This package contains the API to access the "native" electron API. - https://github.com/theolivenbaum/Electron.NET/ + https://github.com/ElectronNet/Electron.NET/ git true electron aspnetcore diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj index 1569a43..f3c4bfa 100644 --- a/ElectronNET.CLI/ElectronNET.CLI.csproj +++ b/ElectronNET.CLI/ElectronNET.CLI.csproj @@ -4,13 +4,13 @@ Exe net5.0 - dotnet-electronize-h5 - electronize-h5 + dotnet-electronize + electronize DotnetCliTool true ..\artifacts - h5.ElectronNET.CLI + ElectronNET.CLI 99.0.0.0 Gregor Biswanger, Robert Muehsig, Rafael Oliveira @@ -21,12 +21,12 @@ This package contains the dotnet tooling to electronize your application. MIT - https://github.com/theolivenbaum/Electron.NET/ - https://github.com/theolivenbaum/Electron.NET/ + https://github.com/ElectronNET/Electron.NET/ + https://github.com/ElectronNET/Electron.NET/ git true electron aspnetcore - Changelog: https://github.com/theolivenbaum/Electron.NET/blob/master/Changelog.md + Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md PackageIcon.png true diff --git a/ElectronNET.CLI/Properties/launchSettings.json b/ElectronNET.CLI/Properties/launchSettings.json index df963f9..5adf9cd 100644 --- a/ElectronNET.CLI/Properties/launchSettings.json +++ b/ElectronNET.CLI/Properties/launchSettings.json @@ -2,12 +2,7 @@ "profiles": { "ElectronNET.CLI": { "commandName": "Project", - "commandLineArgs": "start /project-path \"$(SolutionDir)ElectronNET.WebApp\"" - }, - "test": { - "commandName": "Project", - "commandLineArgs": "build /target win", - "workingDirectory": "C:\\work\\curiosity\\mosaik\\Desktop\\Curiosity.Desktop.Electron" + "commandLineArgs": "start /project-path \"$(SolutionDir)ElectronNET.WebApp\" /watch" } } } \ No newline at end of file diff --git a/ElectronNET.Host/api/app.ts b/ElectronNET.Host/api/app.ts index 1f04f9f..4d8df78 100644 --- a/ElectronNET.Host/api/app.ts +++ b/ElectronNET.Host/api/app.ts @@ -190,7 +190,7 @@ export = (socket: Socket, app: Electron.App) => { electronSocket.emit('appRequestSingleInstanceLockCompleted', success); app.on('second-instance', (event, args = [], workingDirectory = '') => { - electronSocket.emit('secondInstance', [args, workingDirectory]); + electronSocket.emit('secondInstance', { args: args, workingDirectory: workingDirectory }); }); }); diff --git a/ElectronNET.Host/api/dialog.ts b/ElectronNET.Host/api/dialog.ts index 932c5fd..095f7b4 100644 --- a/ElectronNET.Host/api/dialog.ts +++ b/ElectronNET.Host/api/dialog.ts @@ -9,12 +9,12 @@ export = (socket: Socket) => { const window = BrowserWindow.fromId(browserWindow.id); const messageBoxReturnValue = await dialog.showMessageBox(window, options); - electronSocket.emit('showMessageBoxComplete' + guid, [messageBoxReturnValue.response, messageBoxReturnValue.checkboxChecked]); + electronSocket.emit('showMessageBoxComplete' + guid, { response: messageBoxReturnValue.response, checked: messageBoxReturnValue.checkboxChecked }); } else { const id = guid || options; const messageBoxReturnValue = await dialog.showMessageBox(browserWindow); - electronSocket.emit('showMessageBoxComplete' + id, [messageBoxReturnValue.response, messageBoxReturnValue.checkboxChecked]); + electronSocket.emit('showMessageBoxComplete' + id, { response: messageBoxReturnValue.response, checked: messageBoxReturnValue.checkboxChecked }); } }); diff --git a/ElectronNET.Host/api/menu.ts b/ElectronNET.Host/api/menu.ts index efadf31..4385ab0 100644 --- a/ElectronNET.Host/api/menu.ts +++ b/ElectronNET.Host/api/menu.ts @@ -9,7 +9,7 @@ export = (socket: Socket) => { const menu = Menu.buildFromTemplate(menuItems); addContextMenuItemClickConnector(menu.items, browserWindowId, (id, windowId) => { - electronSocket.emit('contextMenuItemClicked', [id, windowId]); + electronSocket.emit('contextMenuItemClicked', { id: id, windowId: windowId }); }); const index = contextMenuItems.findIndex(contextMenu => contextMenu.browserWindowId === browserWindowId); diff --git a/ElectronNET.Host/api/screen.ts b/ElectronNET.Host/api/screen.ts index 3a8b91c..4ee6149 100644 --- a/ElectronNET.Host/api/screen.ts +++ b/ElectronNET.Host/api/screen.ts @@ -18,7 +18,7 @@ export = (socket: Socket) => { socket.on('register-screen-display-metrics-changed', (id) => { screen.on('display-metrics-changed', (event, display, changedMetrics) => { - electronSocket.emit('screen-display-metrics-changed-event' + id, [display, changedMetrics]); + electronSocket.emit('screen-display-metrics-changed-event' + id, { display: display, changedMetrics: changedMetrics }); }); }); diff --git a/ElectronNET.Host/api/tray.ts b/ElectronNET.Host/api/tray.ts index af9f6cf..0c113d2 100644 --- a/ElectronNET.Host/api/tray.ts +++ b/ElectronNET.Host/api/tray.ts @@ -8,7 +8,7 @@ export = (socket: Socket) => { socket.on('register-tray-click', (id) => { if (tray.value) { tray.value.on('click', (event, bounds) => { - electronSocket.emit('tray-click-event' + id, [(event).__proto__, bounds]); + electronSocket.emit('tray-click-event' + id, {eventArgs: (event).__proto__, bounds: bounds }); }); } }); @@ -16,7 +16,7 @@ export = (socket: Socket) => { socket.on('register-tray-right-click', (id) => { if (tray.value) { tray.value.on('right-click', (event, bounds) => { - electronSocket.emit('tray-right-click-event' + id, [(event).__proto__, bounds]); + electronSocket.emit('tray-right-click-event' + id, { eventArgs: (event).__proto__, bounds: bounds }); }); } }); @@ -24,7 +24,7 @@ export = (socket: Socket) => { socket.on('register-tray-double-click', (id) => { if (tray.value) { tray.value.on('double-click', (event, bounds) => { - electronSocket.emit('tray-double-click-event' + id, [(event).__proto__, bounds]); + electronSocket.emit('tray-double-click-event' + id, { eventArgs: (event).__proto__, bounds: bounds }); }); } }); diff --git a/ElectronNET.Host/api/webContents.ts b/ElectronNET.Host/api/webContents.ts index dfb4df3..e2feec9 100644 --- a/ElectronNET.Host/api/webContents.ts +++ b/ElectronNET.Host/api/webContents.ts @@ -181,7 +181,7 @@ export = (socket: Socket) => { browserWindow.webContents.session.cookies.removeAllListeners('changed'); browserWindow.webContents.session.cookies.on('changed', (event, cookie, cause, removed) => { - electronSocket.emit('webContents-session-cookies-changed' + id, [cookie, cause, removed]); + electronSocket.emit('webContents-session-cookies-changed' + id, { cookie: cookie, cause: cause, removed: removed }); }); }); diff --git a/ElectronNET.WebApp/Program.cs b/ElectronNET.WebApp/Program.cs index 54512d2..56ad267 100644 --- a/ElectronNET.WebApp/Program.cs +++ b/ElectronNET.WebApp/Program.cs @@ -10,7 +10,12 @@ namespace ElectronNET.WebApp { public static void Main(string[] args) { + +#if DEBUG + //Uncomment this line to automatically attach the Debugger on launch. This should only be used in development //Debugger.Launch(); +#endif + CreateWebHostBuilder(args).Build().Run(); } diff --git a/ElectronNET.WebApp/Properties/launchSettings.json b/ElectronNET.WebApp/Properties/launchSettings.json index 32efbcd..d5111d5 100644 --- a/ElectronNET.WebApp/Properties/launchSettings.json +++ b/ElectronNET.WebApp/Properties/launchSettings.json @@ -1,32 +1,10 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:50394/", - "sslPort": 0 - } - }, "profiles": { "Electron.NET App": { "commandName": "Executable", - "executablePath": "$(SolutionDir)ElectronNET.CLI\\bin\\Debug\\net5.0\\dotnet-electronize-h5.exe", - "commandLineArgs": "start /from-build-output $(SolutionDir)ElectronNET.WebApp\\bin\\$(Configuration)\\net5.0", + "executablePath": "$(SolutionDir)ElectronNET.CLI\\bin\\Debug\\net5.0\\dotnet-electronize.exe", + "commandLineArgs": "start", "workingDirectory": "$(SolutionDir)ElectronNET.WebApp" - }, - "IIS Express": { - "commandName": "IISExpress", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "ElectronNET.WebApp": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:50395/" } } } \ No newline at end of file diff --git a/ElectronNET.WebApp/electron.manifest.json b/ElectronNET.WebApp/electron.manifest.json index 11001ea..3053f9a 100644 --- a/ElectronNET.WebApp/electron.manifest.json +++ b/ElectronNET.WebApp/electron.manifest.json @@ -1,6 +1,6 @@ { "executable": "ElectronNET.WebApp", - "splashscreen2": { + "splashscreen": { "imageFile": "/wwwroot/assets/img/about@2x.png" }, "environment": "Production",