From 79e35687d767e30c077cb8407dbe9acfafb92518 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 4 Nov 2016 01:06:02 -0700 Subject: [PATCH 1/3] fix merge --- lkg/project.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/lkg/project.json b/lkg/project.json index 3a197eed86e..af848ddca57 100644 --- a/lkg/project.json +++ b/lkg/project.json @@ -1,10 +1,13 @@ - { "dependencies": { +<<<<<<< Updated upstream "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" +======= + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102", +>>>>>>> Stashed changes }, "runtimes": { "win7-x86": { }, @@ -13,8 +16,17 @@ "ubuntu.14.04-x64": { } }, "frameworks": { - "netstandard1.6": { - "imports": "portable-net45+win8" - } - } + "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 From b04c35d0a15c1b9eb2436423cbb912d69d5d52a9 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 4 Nov 2016 02:17:46 -0700 Subject: [PATCH 2/3] Publish lkg using platform --- build.cmd | 20 +++++++++----------- lkg/{ => fsc}/NuGet.Config | 0 lkg/{ => fsc}/project.json | 19 +++++++++---------- lkg/fsi/NuGet.Config | 13 +++++++++++++ lkg/fsi/project.json | 31 +++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 21 deletions(-) rename lkg/{ => fsc}/NuGet.Config (100%) rename lkg/{ => fsc}/project.json (61%) create mode 100644 lkg/fsi/NuGet.Config create mode 100644 lkg/fsi/project.json diff --git a/build.cmd b/build.cmd index ba25d18b578..25713b8bac4 100644 --- a/build.cmd +++ b/build.cmd @@ -478,12 +478,11 @@ if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' ( 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 +echo on + pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure + pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure + pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -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 --no-build -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 @@ -512,7 +511,6 @@ if '%BUILD_PROTO%' == '1' ( ) - echo ---------------- Done with proto, starting build ------------------------ if '%BUILD_PHASE%' == '1' ( @@ -573,15 +571,15 @@ setlocal disableDelayedExpansion if "%INCLUDE_TEST_SPEC_NUNIT%" == "" ( if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" ( set WHERE_ARG_NUNIT=--where "!(%EXCLUDE_TEST_SPEC_NUNIT%)" - ) + ) ) if NOT "%INCLUDE_TEST_SPEC_NUNIT%" == "" ( if "%EXCLUDE_TEST_SPEC_NUNIT%" == "" ( set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT%" - ) + ) if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" ( - set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)" - ) + set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)" + ) ) if NOT "%INCLUDE_TEST_TAGS%" == "" ( set INCLUDE_ARG_RUNALL=-ttags:%INCLUDE_TEST_TAGS% diff --git a/lkg/NuGet.Config b/lkg/fsc/NuGet.Config similarity index 100% rename from lkg/NuGet.Config rename to lkg/fsc/NuGet.Config diff --git a/lkg/project.json b/lkg/fsc/project.json similarity index 61% rename from lkg/project.json rename to lkg/fsc/project.json index af848ddca57..ab155d1ac06 100644 --- a/lkg/project.json +++ b/lkg/fsc/project.json @@ -1,13 +1,12 @@ { + "version": "1.0.0-*", + "name": "fsc", + "buildOptions": { + "debugType": "portable", + "emitEntryPoint": true + }, "dependencies": { -<<<<<<< Updated upstream - "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" -======= "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102", ->>>>>>> Stashed changes }, "runtimes": { "win7-x86": { }, @@ -24,9 +23,9 @@ } }, "imports": "dnxcore50" - }, + } }, "scripts": { - "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ] - }, + "postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ] + } } \ No newline at end of file diff --git a/lkg/fsi/NuGet.Config b/lkg/fsi/NuGet.Config new file mode 100644 index 00000000000..5f26bdd4195 --- /dev/null +++ b/lkg/fsi/NuGet.Config @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/lkg/fsi/project.json b/lkg/fsi/project.json new file mode 100644 index 00000000000..85caf443c5e --- /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%\\runtimes\\any\\native\\* %publish:OutputPath%" ] + } +} \ No newline at end of file From 0c80a4d4bc4b48b9eec9049b334fc052cd934448 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 4 Nov 2016 10:39:16 -0700 Subject: [PATCH 3/3] nothing --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index 25713b8bac4..b1054cb3fff 100644 --- a/build.cmd +++ b/build.cmd @@ -1,4 +1,4 @@ -@if "%_echo%"=="" echo off +@if "%_echo%"=="" echo off setlocal enableDelayedExpansion