Skip to content

Commit

Permalink
Merge pull request #5 from enricosada/update_rest_of_visualfsharp_to_…
Browse files Browse the repository at this point in the history
…netcorertm

[WIP] Update rest of visualfsharp to netcorertm
  • Loading branch information
dsyme authored Jul 7, 2016
2 parents d0f355e + d20d21d commit 5f2f4b6
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 22 deletions.
8 changes: 4 additions & 4 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -340,19 +340,19 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd

rem rename fsc and coreconsole to allow fsc.exe to to start compiler
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
fc fsc.exe corehost.exe >nul
fc fsc.exe dotnet.exe >nul
@if ERRORLEVEL 1 (
copy fsc.exe fsc.dll
copy corehost.exe fsc.exe
copy dotnet.exe fsc.exe
)
popd

rem rename fsc and coreconsole to allow fsc.exe to to start compiler
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
fc fsi.exe corehost.exe >nul
fc fsi.exe dotnet.exe >nul
@if ERRORLEVEL 1 (
copy fsi.exe fsi.dll
copy corehost.exe fsi.exe
copy dotnet.exe fsi.exe
)
popd

Expand Down
3 changes: 3 additions & 0 deletions lkg/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
{
"dependencies": {
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
"Microsoft.NETCore.DotNetHostPolicy": "1.0.1",
"Microsoft.NETCore.DotNetHost": "1.0.1"
},
"runtimes": {
"win7-x86": { },
Expand Down
34 changes: 17 additions & 17 deletions src/fsharp/FSharp.Build/project.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"dependencies": {
"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",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"exclude": "Compile"
},
"System.AppContext": "4.1.0-rc2-24027",
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
"System.Reflection.Primitives": "4.0.1-rc2-24027",
"System.Resources.ResourceManager": "4.0.1-rc2-24027"
{
"dependencies": {
"Microsoft.Build": "0.1.0-preview-00028-160627",
"Microsoft.Build.Framework": "0.1.0-preview-00028-160627",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627",
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.Win32.Registry": {
"version": "4.0.0",
"exclude": "Compile"
},
"System.AppContext": "4.1.0",
"System.Diagnostics.Tools": "4.0.1",
"System.Reflection.Primitives": "4.0.1",
"System.Resources.ResourceManager": "4.0.1"
},
"frameworks": {
"netstandard1.6": {
"imports": "portable-net45+win8"
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core.Unittests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"System.Reflection.Emit": "4.0.1",
"System.Runtime.Loader": "4.0.0",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Threading.Tasks.Parallel": "4.0.1",
"System.Threading.Thread": "4.0.0",
"System.Threading.ThreadPool": "4.0.10"
},
Expand Down

0 comments on commit 5f2f4b6

Please sign in to comment.