Skip to content

Commit 5f2f4b6

Browse files
authored
Merge pull request #5 from enricosada/update_rest_of_visualfsharp_to_netcorertm
[WIP] Update rest of visualfsharp to netcorertm
2 parents d0f355e + d20d21d commit 5f2f4b6

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

build.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,19 +340,19 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
340340

341341
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
342342
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
343-
fc fsc.exe corehost.exe >nul
343+
fc fsc.exe dotnet.exe >nul
344344
@if ERRORLEVEL 1 (
345345
copy fsc.exe fsc.dll
346-
copy corehost.exe fsc.exe
346+
copy dotnet.exe fsc.exe
347347
)
348348
popd
349349

350350
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
351351
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
352-
fc fsi.exe corehost.exe >nul
352+
fc fsi.exe dotnet.exe >nul
353353
@if ERRORLEVEL 1 (
354354
copy fsi.exe fsi.dll
355-
copy corehost.exe fsi.exe
355+
copy dotnet.exe fsi.exe
356356
)
357357
popd
358358

lkg/project.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
{
33
"dependencies": {
44
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
5+
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
6+
"Microsoft.NETCore.DotNetHostPolicy": "1.0.1",
7+
"Microsoft.NETCore.DotNetHost": "1.0.1"
58
},
69
"runtimes": {
710
"win7-x86": { },
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{
2-
"dependencies": {
3-
"Microsoft.Build": "0.1.0-preview-00022",
4-
"Microsoft.Build.Framework": "0.1.0-preview-00022",
5-
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00022",
6-
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00022",
7-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
8-
"Microsoft.Win32.Registry": {
9-
"version": "4.0.0-rc2-24027",
10-
"exclude": "Compile"
11-
},
12-
"System.AppContext": "4.1.0-rc2-24027",
13-
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
14-
"System.Reflection.Primitives": "4.0.1-rc2-24027",
15-
"System.Resources.ResourceManager": "4.0.1-rc2-24027"
1+
{
2+
"dependencies": {
3+
"Microsoft.Build": "0.1.0-preview-00028-160627",
4+
"Microsoft.Build.Framework": "0.1.0-preview-00028-160627",
5+
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627",
6+
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627",
7+
"Microsoft.NETCore.Platforms": "1.0.1",
8+
"Microsoft.Win32.Registry": {
9+
"version": "4.0.0",
10+
"exclude": "Compile"
11+
},
12+
"System.AppContext": "4.1.0",
13+
"System.Diagnostics.Tools": "4.0.1",
14+
"System.Reflection.Primitives": "4.0.1",
15+
"System.Resources.ResourceManager": "4.0.1"
1616
},
1717
"frameworks": {
1818
"netstandard1.6": {
1919
"imports": "portable-net45+win8"
2020
}
21-
}
22-
}
21+
}
22+
}

src/fsharp/FSharp.Core.Unittests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"System.Reflection.Emit": "4.0.1",
99
"System.Runtime.Loader": "4.0.0",
1010
"System.Text.RegularExpressions": "4.1.0",
11-
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
11+
"System.Threading.Tasks.Parallel": "4.0.1",
1212
"System.Threading.Thread": "4.0.0",
1313
"System.Threading.ThreadPool": "4.0.10"
1414
},

0 commit comments

Comments
 (0)