Merge pull request ElectronNET#38 from Petermarcu/master

Move to generic RIDs
jochenkirstaetter · Nov 4, 2017 · 0b351bb · 0b351bb
2 parents 6cca9fa + f981c04
commit 0b351bb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ElectronNET.CLI/Commands/BuildCommand.cs b/ElectronNET.CLI/Commands/BuildCommand.cs
@@ -41,22 +41,22 @@ public Task<bool> ExecuteAsync()
                 switch (desiredPlatform)
                 {
                     case "win":
-                        netCorePublishRid = "win10-x64";
+                        netCorePublishRid = "win-x64";
                         electronPackerPlatform = "win32";
                         break;
                     case "osx":
                         netCorePublishRid = "osx-x64";
                         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 @@ public Task<bool> ExecuteAsync()
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                         {
                             desiredPlatform = "linux";
-                            netCorePublishRid = "ubuntu-x64";
+                            netCorePublishRid = "linux-x64";
                             electronPackerPlatform = "linux";
                         }
 

diff --git a/ElectronNET.CLI/Commands/StartElectronCommand.cs b/ElectronNET.CLI/Commands/StartElectronCommand.cs
@@ -47,7 +47,7 @@ public Task<bool> ExecuteAsync()
                 }
 
                 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");

diff --git a/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -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" />

diff --git a/start.cmd b/start.cmd
@@ -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

diff --git a/start.sh b/start.sh
@@ -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