diff --git a/build.cmd b/build.cmd index ba25d18b578..ec6fa253803 100644 --- a/build.cmd +++ b/build.cmd @@ -479,11 +479,10 @@ rem Build Proto if '%BUILD_PROTO%' == '1' ( if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' ( - pushd .\lkg & %_dotnetexe% restore &popd - @if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure - - pushd .\lkg & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd - @if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure + pushd .\lkg\fsc & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure + pushd .\lkg\fsi & %_dotnetexe% restore & popd & @if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure + pushd .\lkg\fsc & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd & @if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure + pushd .\lkg\fsi & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd & @if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj diff --git a/lkg/fsc/project.json b/lkg/fsc/project.json new file mode 100644 index 00000000000..ab155d1ac06 --- /dev/null +++ b/lkg/fsc/project.json @@ -0,0 +1,31 @@ +{ + "version": "1.0.0-*", + "name": "fsc", + "buildOptions": { + "debugType": "portable", + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102", + }, + "runtimes": { + "win7-x86": { }, + "win7-x64": { }, + "osx.10.10-x64": { }, + "ubuntu.14.04-x64": { } + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.1" + } + }, + "imports": "dnxcore50" + } + }, + "scripts": { + "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ] + } +} \ No newline at end of file diff --git a/lkg/fsi/project.json b/lkg/fsi/project.json new file mode 100644 index 00000000000..0dd87c337f2 --- /dev/null +++ b/lkg/fsi/project.json @@ -0,0 +1,31 @@ +{ + "version": "1.0.0-*", + "name": "fsi", + "buildOptions": { + "debugType": "portable", + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102", + }, + "runtimes": { + "win7-x86": { }, + "win7-x64": { }, + "osx.10.10-x64": { }, + "ubuntu.14.04-x64": { } + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.1" + } + }, + "imports": "dnxcore50" + } + }, + "scripts": { + "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtime\\any\\native\\* %publish:OutputPath%" ] + } +} \ No newline at end of file diff --git a/lkg/project.json b/lkg/project.json deleted file mode 100644 index 3a197eed86e..00000000000 --- a/lkg/project.json +++ /dev/null @@ -1,20 +0,0 @@ - -{ - "dependencies": { - "Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-161102", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", - "Microsoft.NETCore.DotNetHostPolicy": "1.0.1", - "Microsoft.NETCore.DotNetHost": "1.0.1" - }, - "runtimes": { - "win7-x86": { }, - "win7-x64": { }, - "osx.10.10-x64": { }, - "ubuntu.14.04-x64": { } - }, - "frameworks": { - "netstandard1.6": { - "imports": "portable-net45+win8" - } - } -} \ No newline at end of file