Portable project builds!

AArnott · AArnott · commit fe109516a528 · 2016-04-17T22:46:18.000-07:00
diff --git a/LibGit2Sharp.Portable/project.json b/LibGit2Sharp.Portable/project.json
@@ -1,10 +1,10 @@
 ﻿{
   "supports": {
-    "net46.app": {}
   },
   "dependencies": {
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23409",
     "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23409",
     "System.Security.SecureString": "4.0.0-beta-23409",
     "LibGit2Sharp.NativeBinaries": "[1.0.132]",
diff --git a/LibGit2Sharp.Shared/Core/Platform.cs b/LibGit2Sharp.Shared/Core/Platform.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Runtime.InteropServices;
 
 namespace LibGit2Sharp.Core
 {
@@ -20,6 +21,7 @@ public static OperatingSystemType OperatingSystem
         {
             get
             {
+#if NET40
                 // See http://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform
                 switch ((int)Environment.OSVersion.Platform)
                 {
@@ -33,6 +35,24 @@ public static OperatingSystemType OperatingSystem
                     default:
                         return OperatingSystemType.Windows;
                 }
+#else
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    return OperatingSystemType.Windows;
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    return OperatingSystemType.Unix;
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
+                    return OperatingSystemType.MacOSX;
+                }
+                else
+                {
+                    throw new InvalidOperationException();
+                }
+#endif
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Runtime.InteropServices;`
`2`	`3`
`3`	`4`	`namespace LibGit2Sharp.Core`
`4`	`5`	`{`
`@@ -20,6 +21,7 @@ public static OperatingSystemType OperatingSystem`
`20`	`21`	`{`
`21`	`22`	`get`
`22`	`23`	`{`
	`24`	`+#if NET40`
`23`	`25`	`// See http://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform`
`24`	`26`	`switch ((int)Environment.OSVersion.Platform)`
`25`	`27`	`{`
`@@ -33,6 +35,24 @@ public static OperatingSystemType OperatingSystem`
`33`	`35`	`default:`
`34`	`36`	`return OperatingSystemType.Windows;`
`35`	`37`	`}`
	`38`	`+#else`
	`39`	`+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
	`40`	`+ {`
	`41`	`+ return OperatingSystemType.Windows;`
	`42`	`+ }`
	`43`	`+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
	`44`	`+ {`
	`45`	`+ return OperatingSystemType.Unix;`
	`46`	`+ }`
	`47`	`+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
	`48`	`+ {`
	`49`	`+ return OperatingSystemType.MacOSX;`
	`50`	`+ }`
	`51`	`+ else`
	`52`	`+ {`
	`53`	`+ throw new InvalidOperationException();`
	`54`	`+ }`
	`55`	`+#endif`
`36`	`56`	`}`
`37`	`57`	`}`
`38`	`58`	`}`