Skip to content

Commit

Permalink
Use publish to deploy lkg
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinRansom committed Nov 4, 2016
1 parent e8da030 commit bf80d4e
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 25 deletions.
9 changes: 4 additions & 5 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions lkg/fsc/project.json
Original file line number Diff line number Diff line change
@@ -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%" ]
}
}
31 changes: 31 additions & 0 deletions lkg/fsi/project.json
Original file line number Diff line number Diff line change
@@ -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%" ]
}
}
20 changes: 0 additions & 20 deletions lkg/project.json

This file was deleted.

0 comments on commit bf80d4e

Please sign in to comment.