Fix .NET Core Sdk preview2.1 with .NET Core 1.1 (#49)

- add preview2.1 templates - use .net 1.1 for dotnet-compile-fsc - use .net core 1.1 in test and dotnet-compile-fsc preview2.1 - in test suite use `dotnet test`+xunit instead of msbuild scripts - use only nuget.org for build of src/test. use nuget.org + devfeed for running test (temporary)
dotnet · Dec 8, 2016 · 717a9ed · 717a9ed
1 parent 41f6a42
commit 717a9ed
Show file tree

Hide file tree

Showing 223 changed files with 7,093 additions and 25,126 deletions.
diff --git a/test/NuGet.Config → NuGet.Config b/test/NuGet.Config → NuGet.Config
diff --git a/test-msbuild/NuGet.Config → NuGet.withDevFeed.Config b/test-msbuild/NuGet.Config → NuGet.withDevFeed.Config
@@ -3,6 +3,6 @@
   <packageSources>
     <clear />
     <add key="nuget-org" value="https://api.nuget.org/v3/index.json" />
-    <add key="sdk-package" value="../src/FSharp.NET.Sdk/bin/Debug" />
+    <add key="netcorecli-fsc-dev" value="https://www.myget.org/F/netcorecli-fsc-preview2-1/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build.proj b/build.proj
diff --git a/test-msbuild/TestAppConsole/Program.fs → examples/preview2.1/console/Program.fs b/test-msbuild/TestAppConsole/Program.fs → examples/preview2.1/console/Program.fs
@@ -4,5 +4,5 @@ open System
 
 [<EntryPoint>]
 let main argv = 
-    printfn "Hello World from F#!"
+    printfn "Hello World!"
     0 // return an integer exit code
diff --git a/examples/preview2.1/console/project.json b/examples/preview2.1/console/project.json
@@ -0,0 +1,27 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true,
+    "compilerName": "fsc",
+    "compile": {
+      "includeFiles": [
+        "Program.fs"
+      ]
+    }
+  },
+  "tools": {
+    "dotnet-compile-fsc": "1.0.0-preview2.1-*"
+  },
+  "frameworks": {
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.1.0"
+        },
+        "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629"
+      }
+    }
+  }
+}
diff --git a/examples/preview3/lib/Library.fs → examples/preview2.1/lib/Library.fs b/examples/preview3/lib/Library.fs → examples/preview2.1/lib/Library.fs
diff --git a/examples/preview2.1/lib/project.json b/examples/preview2.1/lib/project.json
@@ -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.1-*"
+  },
+  "frameworks": {
+    "netstandard1.6": {
+      "dependencies": {
+        "NETStandard.Library": "1.6.1",
+        "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629"
+      }
+    }
+  }
+}
diff --git a/examples/preview3/NuGet.local.Config b/examples/preview3/NuGet.local.Config
diff --git a/examples/preview3/README.md b/examples/preview3/README.md
diff --git a/examples/preview3/console-crossgen/ExampleConsoleApp.fsproj b/examples/preview3/console-crossgen/ExampleConsoleApp.fsproj
diff --git a/examples/preview3/console-crossgen/Program.fs b/examples/preview3/console-crossgen/Program.fs
diff --git a/examples/preview3/console/ExampleConsoleApp.fsproj b/examples/preview3/console/ExampleConsoleApp.fsproj
diff --git a/examples/preview3/console/Program.fs b/examples/preview3/console/Program.fs
diff --git a/examples/preview3/lib/ExampleLibrary.fsproj b/examples/preview3/lib/ExampleLibrary.fsproj
diff --git a/examples/preview3/mstest/Tests.fs b/examples/preview3/mstest/Tests.fs
diff --git a/examples/preview3/mstest/mstest.fsproj b/examples/preview3/mstest/mstest.fsproj
diff --git a/examples/preview3/web/.bowerrc b/examples/preview3/web/.bowerrc
diff --git a/examples/preview3/web/Controllers/HomeController.fs b/examples/preview3/web/Controllers/HomeController.fs