starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-08 17:56:51 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Move to generic RIDs

Browse Source
This commit is contained in:
Peter Marcu
2017-11-04 09:25:43 -07:00
parent 6cca9faf5e
commit f981c04159
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ElectronNET.CLI/Commands/BuildCommand.cs
View File

@@ -41,7 +41,7 @@ namespace ElectronNET.CLI.Commands
switch (desiredPlatform)
{
case "win":
netCorePublishRid = "win10-x64";
netCorePublishRid = "win-x64";
electronPackerPlatform = "win32";
break;
case "osx":
@@ -49,14 +49,14 @@ namespace ElectronNET.CLI.Commands
electronPackerPlatform = "darwin";
break;
case "linux":
netCorePublishRid = "ubuntu-x64";
netCorePublishRid = "linux-x64";
electronPackerPlatform = "linux";
break;
default:
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
desiredPlatform = "win";
netCorePublishRid = "win10-x64";
netCorePublishRid = "win-x64";
electronPackerPlatform = "win32";
}
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -68,7 +68,7 @@ namespace ElectronNET.CLI.Commands
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
desiredPlatform = "linux";
netCorePublishRid = "ubuntu-x64";
netCorePublishRid = "linux-x64";
electronPackerPlatform = "linux";
}

2
ElectronNET.CLI/Commands/StartElectronCommand.cs
View File

@@ -47,7 +47,7 @@ namespace ElectronNET.CLI.Commands
}
string tempBinPath = Path.Combine(tempPath, "bin");
ProcessHelper.CmdExecute($"dotnet publish -r win10-x64 --output \"{tempBinPath}\"", aspCoreProjectPath);
ProcessHelper.CmdExecute($"dotnet publish -r win-x64 --output \"{tempBinPath}\"", aspCoreProjectPath);
EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "main.js");
EmbeddedFileHelper.DeployEmbeddedFile(tempPath, "package.json");

2
ElectronNET.WebApp/ElectronNET.WebApp.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Controllers\ManageWindowsController.cs" />

2
start.cmd
View File

@@ -2,7 +2,7 @@ echo Bundle ASP.NET Core Project into EXE
cd ElectronNET.WebApp
dotnet restore
dotnet publish -r win10-x64 --output ../ElectronNET.Host/bin/
dotnet publish -r win-x64 --output ../ElectronNET.Host/bin/
echo Start Electron with bundled EXE
cd ..\ElectronNET.Host

2
start.sh
View File

@@ -2,7 +2,7 @@ echo Bundle ASP.NET Core Project into EXE
cd ElectronNET.WebApp
dotnet restore
dotnet publish -r osx.10.11-x64 --output ../ElectronNET.Host/bin/
dotnet publish -r osx-x64 --output ../ElectronNET.Host/bin/
echo Start Electron with bundled EXE
cd ../ElectronNET.Host