diff --git a/src/Microsoft.DotNet.Tools.Compiler/Program.cs b/src/Microsoft.DotNet.Tools.Compiler/Program.cs
index e3d47650a..86e7c8efa 100644
--- a/src/Microsoft.DotNet.Tools.Compiler/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Compiler/Program.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Microsoft.Dnx.Runtime.Common.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.ProjectModel;
@@ -256,9 +257,15 @@ namespace Microsoft.DotNet.Tools.Compiler
                 cscArgs.Add($"-keyFile:\"{compilationOptions.KeyFile}\"");
             }
 
-            // TODO: Support debug portable
-            cscArgs.Add("-debug:full");
-
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                cscArgs.Add("-debug:full");
+            }
+            else
+            {
+                cscArgs.Add("-debug:portable");
+            }
+            
             // TODO: OSS signing
         }
 
diff --git a/src/Microsoft.Extensions.ProjectModel/project.json b/src/Microsoft.Extensions.ProjectModel/project.json
index 73b050f92..8feeba45e 100644
--- a/src/Microsoft.Extensions.ProjectModel/project.json
+++ b/src/Microsoft.Extensions.ProjectModel/project.json
@@ -12,7 +12,7 @@
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-*",
 
     "NuGet.Packaging": "3.2.0",
-    "System.Security.Cryptography.Algorithms": "4.0.0-*",
+    "System.Security.Cryptography.Algorithms": "4.0.0-beta-23401",
 
     "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-*",
     "Microsoft.Extensions.JsonParser.Sources": {