Merge pull request #583 from enricosada/use_netcoresdk_preview1

Use netcoresdk preview1
fsharp · Jun 20, 2016 · e59524b · e59524b
2 parents a853c8d + c612d13
commit e59524b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/NuGet.Config b/src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/NuGet.Config
@@ -1,13 +1,9 @@
 <?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" />
+    <!-- MSBuild -->
     <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
-    <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> 
+
   </packageSources>
 </configuration>
diff --git a/src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/project.json b/src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/project.json
@@ -51,17 +51,17 @@
       "type": "platform",
       "version": "1.0.0-rc2-3002702"
     },
-    "Microsoft.Build": "0.1.0-preview-*",
-    "Microsoft.Build.Framework": "0.1.0-preview-*",
-    "Microsoft.Build.Tasks.Core": "0.1.0-preview-*",
-    "Microsoft.Build.Utilities.Core": "0.1.0-preview-*",
+    "Microsoft.Build": "0.1.0-preview-00022",
+    "Microsoft.Build.Framework": "0.1.0-preview-00022",
+    "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022",
+    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022",
     "System.Runtime.Serialization.Json": "4.0.2-rc2-*",
     "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
     "FSharp.Compiler.Service.netcore": "1.0.0-alpha-*",
   },
   "tools": {
     "dotnet-compile-fsc": {
-      "version": "1.0.0-rc2-*",
+      "version": "1.0.0-preview1-*",
       "imports": [
         "dnxcore50",
         "portable-net45+win81",

diff --git a/src/fsharp/FSharp.Compiler.Service.netcore/NuGet.Config b/src/fsharp/FSharp.Compiler.Service.netcore/NuGet.Config
@@ -1,13 +1,6 @@
 <?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" />
-    <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
-    <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> 
   </packageSources>
 </configuration>
diff --git a/src/fsharp/FSharp.Compiler.Service.netcore/project.json b/src/fsharp/FSharp.Compiler.Service.netcore/project.json
@@ -280,17 +280,19 @@
     ]
   },
   "dependencies": {
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.0.0-rc2-3002702"
-    },
+    "NETStandard.Library": "1.5.0-rc2-24027",
     "System.Diagnostics.TraceSource": "4.0.0-rc2-*",
     "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
+    "System.Collections.Immutable": "1.2.0-rc2-24027",
+    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
+    "System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
+    "System.Reflection.Metadata": "1.3.0-rc2-24027",
+    "System.Diagnostics.Process": "4.1.0-rc2-24027"
   },
   "tools": {
     "dotnet-fssrgen": "3.0.1",
     "dotnet-compile-fsc": {
-      "version": "1.0.0-rc2-*",
+      "version": "1.0.0-preview1-*",
       "imports": [
         "dnxcore50",
         "portable-net45+win81",