starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-22 15:04:47 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

cleanup for merge

Browse Source
This commit is contained in:
rafael-aero
2021-08-18 10:42:24 +02:00
parent bd08938c49
commit 336c3b9400
12 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ElectronNET.API/ElectronNET.API.csproj
View File

@@ -4,15 +4,15 @@
<TargetFramework>net5.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>..\artifacts</PackageOutputPath>
<PackageId>h5.ElectronNET.API</PackageId>
<PackageId>ElectronNET.API</PackageId>
<Authors>Gregor Biswanger, Robert Muehsig, Rafael Oliveira</Authors>
<Company />
<Product>Electron.NET</Product>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/theolivenbaum/Electron.NET/</PackageProjectUrl>
<PackageProjectUrl>https://github.com/ElectronNet/Electron.NET/</PackageProjectUrl>
<Description>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.</Description>
<RepositoryUrl>https://github.com/theolivenbaum/Electron.NET/</RepositoryUrl>
<RepositoryUrl>https://github.com/ElectronNet/Electron.NET/</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageTags>electron aspnetcore</PackageTags>

12
ElectronNET.CLI/ElectronNET.CLI.csproj
View File

@@ -4,13 +4,13 @@
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<AssemblyName>dotnet-electronize-h5</AssemblyName>
<ToolCommandName>electronize-h5</ToolCommandName>
<AssemblyName>dotnet-electronize</AssemblyName>
<ToolCommandName>electronize</ToolCommandName>
<PackageType>DotnetCliTool</PackageType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>..\artifacts</PackageOutputPath>
<PackageId>h5.ElectronNET.CLI</PackageId>
<PackageId>ElectronNET.CLI</PackageId>
<!-- Version 99 is just set for local development stuff to avoid a conflict with "real" packages on NuGet.org -->
<Version>99.0.0.0</Version>
<Authors>Gregor Biswanger, Robert Muehsig, Rafael Oliveira</Authors>
@@ -21,12 +21,12 @@
This package contains the dotnet tooling to electronize your application.
</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/theolivenbaum/Electron.NET/</PackageProjectUrl>
<RepositoryUrl>https://github.com/theolivenbaum/Electron.NET/</RepositoryUrl>
<PackageProjectUrl>https://github.com/ElectronNET/Electron.NET/</PackageProjectUrl>
<RepositoryUrl>https://github.com/ElectronNET/Electron.NET/</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageTags>electron aspnetcore</PackageTags>
<PackageReleaseNotes>Changelog: https://github.com/theolivenbaum/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
<PackageIcon>PackageIcon.png</PackageIcon>
<PackAsTool>true</PackAsTool>
<StartupObject></StartupObject>

7
ElectronNET.CLI/Properties/launchSettings.json
View File

@@ -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"
}
}
}

2
ElectronNET.Host/api/app.ts
View File

@@ -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 });
});
});

4
ElectronNET.Host/api/dialog.ts
View File

@@ -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 });
}
});

2
ElectronNET.Host/api/menu.ts
View File

@@ -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);

2
ElectronNET.Host/api/screen.ts
View File

@@ -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 });
});
});

6
ElectronNET.Host/api/tray.ts
View File

@@ -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, [(<any>event).__proto__, bounds]);
electronSocket.emit('tray-click-event' + id, {eventArgs: (<any>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, [(<any>event).__proto__, bounds]);
electronSocket.emit('tray-right-click-event' + id, { eventArgs: (<any>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, [(<any>event).__proto__, bounds]);
electronSocket.emit('tray-double-click-event' + id, { eventArgs: (<any>event).__proto__, bounds: bounds });
});
}
});

2
ElectronNET.Host/api/webContents.ts
View File

@@ -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 });
});
});

5
ElectronNET.WebApp/Program.cs
View File

@@ -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();
}

26
ElectronNET.WebApp/Properties/launchSettings.json
View File

@@ -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/"
}
}
}

2
ElectronNET.WebApp/electron.manifest.json
View File

@@ -1,6 +1,6 @@
{
"executable": "ElectronNET.WebApp",
"splashscreen2": {
"splashscreen": {
"imageFile": "/wwwroot/assets/img/about@2x.png"
},
"environment": "Production",