Skip to content

Commit e59524b

Browse files
authored
Merge pull request #583 from enricosada/use_netcoresdk_preview1
Use netcoresdk preview1
2 parents a853c8d + c612d13 commit e59524b

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
5-
<clear />
6-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
74
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
5+
<!-- MSBuild -->
86
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
9-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
10-
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
11-
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
7+
128
</packageSources>
139
</configuration>

src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@
5151
"type": "platform",
5252
"version": "1.0.0-rc2-3002702"
5353
},
54-
"Microsoft.Build": "0.1.0-preview-*",
55-
"Microsoft.Build.Framework": "0.1.0-preview-*",
56-
"Microsoft.Build.Tasks.Core": "0.1.0-preview-*",
57-
"Microsoft.Build.Utilities.Core": "0.1.0-preview-*",
54+
"Microsoft.Build": "0.1.0-preview-00022",
55+
"Microsoft.Build.Framework": "0.1.0-preview-00022",
56+
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00022",
57+
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00022",
5858
"System.Runtime.Serialization.Json": "4.0.2-rc2-*",
5959
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
6060
"FSharp.Compiler.Service.netcore": "1.0.0-alpha-*",
6161
},
6262
"tools": {
6363
"dotnet-compile-fsc": {
64-
"version": "1.0.0-rc2-*",
64+
"version": "1.0.0-preview1-*",
6565
"imports": [
6666
"dnxcore50",
6767
"portable-net45+win81",
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
5-
<clear />
6-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
74
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
8-
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
9-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
10-
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
11-
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
125
</packageSources>
136
</configuration>

src/fsharp/FSharp.Compiler.Service.netcore/project.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,17 +280,19 @@
280280
]
281281
},
282282
"dependencies": {
283-
"Microsoft.NETCore.App": {
284-
"type": "platform",
285-
"version": "1.0.0-rc2-3002702"
286-
},
283+
"NETStandard.Library": "1.5.0-rc2-24027",
287284
"System.Diagnostics.TraceSource": "4.0.0-rc2-*",
288285
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
286+
"System.Collections.Immutable": "1.2.0-rc2-24027",
287+
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
288+
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
289+
"System.Reflection.Metadata": "1.3.0-rc2-24027",
290+
"System.Diagnostics.Process": "4.1.0-rc2-24027"
289291
},
290292
"tools": {
291293
"dotnet-fssrgen": "3.0.1",
292294
"dotnet-compile-fsc": {
293-
"version": "1.0.0-rc2-*",
295+
"version": "1.0.0-preview1-*",
294296
"imports": [
295297
"dnxcore50",
296298
"portable-net45+win81",

0 commit comments

Comments
 (0)