Merge pull request #3789 from cartermp/fs-update

Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)

src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
-    
-     <!-- Location of dotnet-compile-fsc tool -->
-    <add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
-  </packageSources>
-</configuration>

src/dotnet/commands/dotnet-new/FSharp_Console/Program.fs

@@ -5,5 +5,4 @@ open System
 [<EntryPoint>]
 let main argv = 
     printfn "Hello World!"
-    printfn "%A" argv
     0 // return an integer exit code

src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "buildOptions": {
+    "debugType": "portable",
     "emitEntryPoint": true,
     "compilerName": "fsc",
     "compile": {
@@ -9,18 +10,8 @@
       ]
     }
   },
-  "dependencies": {
-    "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
-  },
   "tools": {
-    "dotnet-compile-fsc": {
-      "version": "1.0.0-preview2-*",
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win81",
-        "netstandard1.3"
-      ]
-    }
+    "dotnet-compile-fsc":"1.0.0-preview2-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -28,12 +19,9 @@
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.0"
-        }
-      },
-      "imports": [
-        "portable-net45+win8",
-        "dnxcore50"
-      ]
+        },
+        "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629"
+      }
     }
   }
-}
+}

src/dotnet/commands/dotnet-new/FSharp_Lib/Library.fs

@@ -0,0 +1,5 @@
+namespace Library
+ 
+module Say =
+    let hello name =
+        printfn "Hello %s" name

src/dotnet/commands/dotnet-new/FSharp_Lib/project.json.template

@@ -0,0 +1,23 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable"
+    "compilerName": "fsc",
+    "compile": {
+      "includeFiles": [
+        "Library.fs"
+      ]
+    }
+  },
+  "tools": {
+    "dotnet-compile-fsc":"1.0.0-preview2-*"
+  },
+  "frameworks": {
+    "netstandard1.6": {
+      "dependencies": {
+        "NETStandard.Library":"1.6.0",
+        "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629"
+      }
+    }
+  }
+}

src/dotnet/commands/dotnet-new/Program.cs

@@ -97,7 +97,7 @@ namespace Microsoft.DotNet.Tools.New
             app.HelpOption("-h|--help");
 
             var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web", "Lib", "xunittest" } };
-            var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console" } };
+            var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console", "Lib" } };
 
             var languages = new[] { csharp, fsharp };
 

src/dotnet/commands/dotnet-new/README.md

@@ -36,6 +36,7 @@ Type of the project. Valid values for C# are:
 Valid values for F# are:
 
 * `console`
+* `lib`
 
 ## EXAMPLES
 

src/dotnet/project.json

@@ -7,8 +7,9 @@
         "commands/dotnet-new/CSharp_Console.zip",
         "commands/dotnet-new/CSharp_Lib.zip",
         "commands/dotnet-new/CSharp_xunittest.zip",
+        "commands/dotnet-new/CSharp_Web.zip",
         "commands/dotnet-new/FSharp_Console.zip",
-        "commands/dotnet-new/CSharp_Web.zip"
+        "commands/dotnet-new/FSharp_Lib.zip"
       ]
     },
     "compile": {
@@ -17,6 +18,7 @@
         "commands/dotnet-new/FSharp_Console/**",
         "commands/dotnet-new/CSharp_Web/**",
         "commands/dotnet-new/CSharp_Lib/**",
+        "commands/dotnet-new/FSharp_Lib/**",
         "commands/dotnet-new/CSharp_xunittest/**"
       ]
     }