Elide portable libraries from OSS build (#3193)

* remove portables * temp * remove bin from profiles paths * reorder setup build * Ensure nuget is built prior to setup * remove portable customizations from targets * fix ci_part1

Elide portable libraries from OSS build (#3193)
* remove portables * temp * remove bin from profiles paths * reorder setup build * Ensure nuget is built prior to setup * remove portable customizations from targets * fix ci_part1
1b109962 · Kevin Ransom (msft) · GitHub · 9ffcc026 · 1b109962 · 1b109962
17 changed file
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -27,10 +27,6 @@
    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
 </ItemGroup>

-  <ItemGroup Condition="'$(BUILD_PORTABLE)'=='1'">
-    <ProjectsWithPortableFrameworks Include="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
-  </ItemGroup>
-
  <ItemGroup Condition="'$(BUILD_VS)'=='1'">
    <ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-src-build.proj" />
    <ProjectsWithNet40 Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" />
@@ -57,10 +53,6 @@
    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
  </ItemGroup>

-  <ItemGroup Condition="'$(TEST_PORTABLE_COREUNIT_SUITE)'=='1' and ('$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259') " >
-    <ProjectsWithPortableFrameworks Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
-  </ItemGroup>
-
  <ItemGroup Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj"/>
  </ItemGroup>
@@ -86,38 +78,24 @@

  <Target Name="Build">
    <MSBuild Projects="@(ProjectsWithNet40)"              Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=xamarinmacmobile;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(ProjectsWithCoreClr)"            Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(SetupProjects)"                  Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(NugetProjects)"                  Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);" />
+    <MSBuild Projects="@(SetupProjects)"                  Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
  </Target>

  <Target Name="Rebuild">
    <MSBuild Projects="@(ProjectsWithNet40)"              Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(ProjectsWithNet40PlusDefine)"    Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(ProjectsWithCoreClr)"            Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(SetupProjects)"                  Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(NugetProjects)"                  Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);" />
+    <MSBuild Projects="@(SetupProjects)"                  Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
  </Target>

  <Target Name="Clean">
    <MSBuild Projects="@(ProjectsWithNet40)"              Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(ProjectsWithNet40PlusDefine)"    Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=net40;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);FSHARP_SUITE_DRIVES_CORECLR_TESTS=true" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable7;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable47;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable78;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(ProjectsWithPortableFrameworks)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetDotnetProfile=portable259;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(ProjectsWithCoreClr)"            Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetDotnetProfile=coreclr;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
-    <MSBuild Projects="@(SetupProjects)"                  Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
    <MSBuild Projects="@(NugetProjects)"                  Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);" />
+    <MSBuild Projects="@(SetupProjects)"                  Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
  </Target>
 </Project>
--- a/build.cmd
+++ b/build.cmd
@@ -17,12 +17,12 @@ echo Build and run a subset of test suites
 echo.
 echo Usage:
 echo.
-echo build.cmd ^<all^|net40^|coreclr^|pcls^|vs^>
+echo build.cmd ^<all^|net40^|coreclr^|vs^>
 echo           ^<proto^|protofx^>
 echo           ^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
 echo           ^<debug^|release^>
 echo           ^<diag^|publicsign^>
-echo           ^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-pcl-coreunit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
+echo           ^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
 echo           ^<include tag^>
 echo           ^<init^>
 echo.
@@ -59,7 +59,6 @@ set BUILD_PHASE=1
 set BUILD_NET40=0
 set BUILD_NET40_FSHARP_CORE=0
 set BUILD_CORECLR=0
-set BUILD_PORTABLE=0
 set BUILD_VS=0
 set BUILD_CONFIG=release
 set BUILD_CONFIG_LOWERCASE=release
@@ -72,7 +71,6 @@ set TEST_NET40_FSHARP_SUITE=0
 set TEST_NET40_FSHARPQA_SUITE=0
 set TEST_CORECLR_COREUNIT_SUITE=0
 set TEST_CORECLR_FSHARP_SUITE=0
-set TEST_PORTABLE_COREUNIT_SUITE=0
 set TEST_VS_IDEUNIT_SUITE=0
 set INCLUDE_TEST_SPEC_NUNIT=
 set INCLUDE_TEST_TAGS=
@@ -116,10 +114,6 @@ if /i "%_autoselect_tests%" == "1" (
        set TEST_CORECLR_COREUNIT_SUITE=1
    )

-    if /i "%BUILD_PORTABLE%" == "1" (
-        set TEST_PORTABLE_COREUNIT_SUITE=1
-    )
-
    if /i "%BUILD_VS%" == "1" (
        set TEST_VS_IDEUNIT_SUITE=1
    )
@@ -152,11 +146,6 @@ if /i "%ARG%" == "coreclr" (
    set BUILD_CORECLR=1
 )

-if /i "%ARG%" == "pcls" (
-    set _autoselect=0
-    set BUILD_PORTABLE=1
-)
-
 if /i "%ARG%" == "vs" (
    set _autoselect=0
    set BUILD_NET40=1
@@ -176,7 +165,6 @@ if /i "%ARG%" == "all" (
    set BUILD_PROTO_WITH_CORECLR_LKG=1
    set BUILD_NET40=1
    set BUILD_CORECLR=1
-    set BUILD_PORTABLE=1
    set BUILD_VS=1
    set BUILD_SETUP=%FSC_BUILD_SETUP%
    set BUILD_NUGET=1
@@ -190,7 +178,6 @@ if /i "%ARG%" == "microbuild" (
    set BUILD_NET40_FSHARP_CORE=1
    set BUILD_PROTO_WITH_CORECLR_LKG=1
    set BUILD_CORECLR=1
-    set BUILD_PORTABLE=1
    set BUILD_VS=1
    set BUILD_SETUP=%FSC_BUILD_SETUP%
    set BUILD_NUGET=1
@@ -201,7 +188,6 @@ if /i "%ARG%" == "microbuild" (
    set TEST_NET40_FSHARPQA_SUITE=1
    set TEST_CORECLR_COREUNIT_SUITE=0
    set TEST_CORECLR_FSHARP_SUITE=0
-    set TEST_PORTABLE_COREUNIT_SUITE=1
    set TEST_VS_IDEUNIT_SUITE=1
    set CI=1
    set PUBLISH_VSIX=1
@@ -217,7 +203,6 @@ if /i "%ARG%" == "nuget" (
    set BUILD_PROTO=1
    set BUILD_NET40_FSHARP_CORE=1
    set BUILD_PROTO_WITH_CORECLR_LKG=1
-    set BUILD_PORTABLE=1
    set BUILD_CORECLR=1
    set BUILD_NUGET=1
 )
@@ -229,10 +214,12 @@ if /i "%ARG%" == "ci_part1" (
    REM what we do
    set BUILD_PROTO=1
    set BUILD_NET40=1
+    set BUILD_PROTO_WITH_CORECLR_LKG=1
    set BUILD_NET40_FSHARP_CORE=1
-    set BUILD_PORTABLE=1
    set BUILD_VS=1
+    set BUILD_CORECLR=1
    set BUILD_SETUP=%FSC_BUILD_SETUP%
+    set BUILD_NUGET=1
    set TEST_VS_IDEUNIT_SUITE=1
    set CI=1
 )
@@ -257,7 +244,6 @@ if /i "%ARG%" == "ci_part3" (
    set BUILD_PROTO=1
    set BUILD_CORECLR=1
    set BUILD_NET40_FSHARP_CORE=1
-    set BUILD_PORTABLE=1
    set BUILD_NUGET=1
    set TEST_CORECLR_FSHARP_SUITE=1
    set TEST_CORECLR_COREUNIT_SUITE=1
@@ -271,11 +257,9 @@ if /i "%ARG%" == "ci_part4" (
    set BUILD_PROTO=1
    set BUILD_NET40=1
    set BUILD_NET40_FSHARP_CORE=1
-    set BUILD_PORTABLE=1

    set TEST_NET40_COMPILERUNIT_SUITE=1
    set TEST_NET40_FSHARPQA_SUITE=1
-    set TEST_PORTABLE_COREUNIT_SUITE=1
    set CI=1
 )

@@ -314,7 +298,6 @@ if /i "%ARG%" == "test-all" (
    set BUILD_NET40=1
    set BUILD_NET40_FSHARP_CORE=1
    set BUILD_CORECLR=1
-    set BUILD_PORTABLE=1
    set BUILD_VS=1
    set BUILD_SETUP=%FSC_BUILD_SETUP%
    set BUILD_NUGET=1
@@ -323,7 +306,6 @@ if /i "%ARG%" == "test-all" (
    set TEST_NET40_COREUNIT_SUITE=1
    set TEST_NET40_FSHARP_SUITE=1
    set TEST_NET40_FSHARPQA_SUITE=1
-    set TEST_PORTABLE_COREUNIT_SUITE=1
    set TEST_CORECLR_COREUNIT_SUITE=1
    set TEST_VS_IDEUNIT_SUITE=1
 )
@@ -332,7 +314,6 @@ if /i "%ARG%" == "test-net40-fsharpqa" (
    set _autoselect=0
    set BUILD_NET40=1
    set BUILD_NET40_FSHARP_CORE=1
-    set BUILD_PORTABLE=1
    set TEST_NET40_FSHARPQA_SUITE=1
 )

@@ -348,7 +329,6 @@ if /i "%ARG%" == "test-net40-ideunit" (
    set BUILD_NET40=1
    set BUILD_NET40_FSHARP_CORE=1
    set BUILD_VS=1
-    set BUILD_PORTABLE=1
    set TEST_VS_IDEUNIT_SUITE=1
 )

@@ -365,17 +345,10 @@ if /i "%ARG%" == "test-coreclr-coreunit" (
    set TEST_CORECLR_COREUNIT_SUITE=1
 )

-if /i "%ARG%" == "test-pcl-coreunit" (
-    set _autoselect=0
-    set BUILD_PORTABLE=1
-    set TEST_PORTABLE_COREUNIT_SUITE=1
-)
-
 if /i "%ARG%" == "test-net40-fsharp" (
    set _autoselect=0
    set BUILD_NET40=1
    set BUILD_NET40_FSHARP_CORE=1
-    set BUILD_PORTABLE=1
    set TEST_NET40_FSHARP_SUITE=1
 )

@@ -417,9 +390,9 @@ echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
 echo BUILD_NET40=%BUILD_NET40%
 echo BUILD_NET40_FSHARP_CORE=%BUILD_NET40_FSHARP_CORE%
 echo BUILD_CORECLR=%BUILD_CORECLR%
-echo BUILD_PORTABLE=%BUILD_PORTABLE%
 echo BUILD_VS=%BUILD_VS%
 echo BUILD_SETUP=%BUILD_SETUP%
+echo BUILD_NUGET=%BUILD_NUGET%
 echo BUILD_CONFIG=%BUILD_CONFIG%
 echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
 echo.
@@ -429,7 +402,6 @@ echo TEST_NET40_FSHARP_SUITE=%TEST_NET40_FSHARP_SUITE%
 echo TEST_NET40_FSHARPQA_SUITE=%TEST_NET40_FSHARPQA_SUITE%
 echo TEST_CORECLR_COREUNIT_SUITE=%TEST_CORECLR_COREUNIT_SUITE%
 echo TEST_CORECLR_FSHARP_SUITE=%TEST_CORECLR_FSHARP_SUITE%
-echo TEST_PORTABLE_COREUNIT_SUITE=%TEST_PORTABLE_COREUNIT_SUITE%
 echo TEST_VS_IDEUNIT_SUITE=%TEST_VS_IDEUNIT_SUITE%
 echo INCLUDE_TEST_SPEC_NUNIT=%INCLUDE_TEST_SPEC_NUNIT%
 echo INCLUDE_TEST_TAGS=%INCLUDE_TEST_TAGS%
@@ -568,15 +540,6 @@ if "%RestorePackages%" == "true" (
    )
 )

-if "%BUILD_NUGET%" == "1" (
-    :: Copy the net20 and net40 build directory for nuget building
-    md %~dp0%BUILD_CONFIG%\dotnet20\bin
-    copy /Y %~dp0packages\FSharp.Core.4.1.17\lib\net20\*.* %~dp0%BUILD_CONFIG%\dotnet20\bin
-
-    md %~dp0%BUILD_CONFIG%\dotnet40\bin
-    copy /Y %~dp0packages\FSharp.Core.4.1.17\lib\net40\*.* %~dp0%BUILD_CONFIG%\dotnet40\bin
-)
-
 if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
    :: Restore the Tools directory
    call %~dp0init-tools.cmd
@@ -701,7 +664,7 @@ echo SNEXE64:           %SNEXE64%
 echo ILDASM:            %ILDASM%
 echo

-if "%TEST_NET40_COMPILERUNIT_SUITE%" == "0" if "%TEST_NET40_COREUNIT_SUITE%" == "0" if "%TEST_PORTABLE_COREUNIT_SUITE%" == "0" if "%TEST_CORECLR_COREUNIT_SUITE%" == "0" if "%TEST_VS_IDEUNIT_SUITE%" == "0" if "%TEST_NET40_FSHARP_SUITE%" == "0" if "%TEST_NET40_FSHARPQA_SUITE%" == "0" goto :success
+if "%TEST_NET40_COMPILERUNIT_SUITE%" == "0" if "%TEST_NET40_COREUNIT_SUITE%" == "0" if "%TEST_CORECLR_COREUNIT_SUITE%" == "0" if "%TEST_VS_IDEUNIT_SUITE%" == "0" if "%TEST_NET40_FSHARP_SUITE%" == "0" if "%TEST_NET40_FSHARPQA_SUITE%" == "0" goto :success

 echo ---------------- Done with update, starting tests -----------------------

@@ -860,37 +823,6 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
    )
 )

-REM  ---------------- portable-coreunit  -----------------------
-
-if "%TEST_PORTABLE_COREUNIT_SUITE%" == "1" (
-
-    set OUTPUTARG=
-    set ERRORARG=
-    set OUTPUTFILE=
-    set ERRORFILE=
-    set XMLFILE=!RESULTSDIR!\test-portable-coreunit-results.xml
-    if "%CI%" == "1" (
-        set OUTPUTFILE=!RESULTSDIR!\test-portable-coreunit-output.log
-        set ERRORFILE=!RESULTSDIR!\test-portable-coreunit-errors.log
-        set ERRORARG=--err:"!ERRORFILE!" 
-        set OUTPUTARG=--output:"!OUTPUTFILE!" 
-    )
-
-    echo "!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! /work="!FSCBINPATH!" "!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
-         "!NUNIT3_CONSOLE!" /framework:V4.0 /result="!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! /work="!FSCBINPATH!" "!FSCBINPATH!\..\..\portable7\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable47\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable78\bin\FSharp.Core.Unittests.dll" "!FSCBINPATH!\..\..\portable259\bin\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
-
-    if errorlevel 1 (
-        echo -----------------------------------------------------------------
-        type "!OUTPUTFILE!"
-        echo -----------------------------------------------------------------
-        type "!ERRORFILE!"
-        echo -----------------------------------------------------------------
-        echo Error: Running tests portable-coreunit failed, see logs above -- FAILED
-        echo -----------------------------------------------------------------
-        goto :failure
-    )
-)
-
 REM  ---------------- coreclr-coreunit  -----------------------

 if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (

--- a/packages.config
+++ b/packages.config
@@ -41,8 +41,8 @@
  <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
  <package id="FSharp.Compiler.Tools" version="4.1.5"/>

-  <!-- FSharp.Core is used to get the net20 and net40 builds of FSharp.Core.dll -->
-  <package id="FSharp.Core" version="4.1.17"/>
+  <!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
+  <package id="Microsoft.Portable.FSharp.Core" version="4.1.18"/>

  <!-- FSharp.Data is used in some of the scripts ued for the coreclr build -->
  <package id="FSharp.Data" version="2.2.5" />

--- a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
@@ -53,38 +53,38 @@
    </DirectoryRef>
    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0">
      <Component Id="Runtime_Redist_3.47.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.47.41.0_FSharp.Core, $(var.LocaleCode)))">
-        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.dll" KeyPath="yes" />
-        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\profiles\portable-net45+sl5+netcore45\FSharp.Core.xml" />
        <!-- See notes above on signdata/optdata and why they are still included here.  -->
-        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.sigdata" />
-        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.optdata" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata" />
      </Component>
    </DirectoryRef>
    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0">
      <Component Id="Runtime_Redist_3.7.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.7.41.0_FSharp.Core, $(var.LocaleCode)))">
-        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.dll" KeyPath="yes" />
-        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45\FSharp.Core.xml" />
        <!-- See notes above on signdata/optdata and why they are still included here.  -->
-        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.sigdata" />
-        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.optdata" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45\FSharp.Core.optdata" />
      </Component>
    </DirectoryRef>
    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0">
      <Component Id="Runtime_Redist_3.78.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.41.0_FSharp.Core, $(var.LocaleCode)))">
-        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.dll" KeyPath="yes" />
-        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wp8\FSharp.Core.xml" />
        <!-- See notes above on signdata/optdata and why they are still included here.  -->
-        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.sigdata" />
-        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.optdata" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata" />
      </Component>
    </DirectoryRef>
    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0">
      <Component Id="Runtime_Redist_3.259.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.41.0_FSharp.Core, $(var.LocaleCode)))">
-        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.dll" KeyPath="yes" />
-        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml" />
        <!-- See notes above on signdata/optdata and why they are still included here.  -->
-        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.sigdata" />
-        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.optdata" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata" />
      </Component>
    </DirectoryRef>


--- a/src/FSharpSource.Settings.targets
+++ b/src/FSharpSource.Settings.targets
@@ -35,8 +35,6 @@
    <RoslynVersion>2.0.0</RoslynVersion>
    <RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
    <RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
-    <!--<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26124-RC3</VSSDK_BUILDTOOLS_VERSION>-->
-    <!--<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.$(RoslynVSPackagesVersion)</VSSDK_BUILDTOOLS_VERSION> -->
    <VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>

    <MicrosoftVisualStudioThreadingVersion>15.0.240</MicrosoftVisualStudioThreadingVersion>

--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
  <PropertyGroup>
-    <IsPortableProfile Condition="'$(TargetDotnetProfile)' == 'portable47' or '$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259'">true</IsPortableProfile>
-    <FSCoreVersion Condition="'$(IsPortableProfile)' != 'true'">4.4.1.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'portable7'">3.7.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'portable47'">3.47.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'portable78'">3.78.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'portable259'">3.259.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'monoandroid10+monotouch10+xamarinios10' ">3.98.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(TargetDotnetProfile)' == 'xamarinmacmobile' ">3.99.41.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(FSharpCoreBackVersion)' == '3.0' AND '$(FSCoreVersion)' == '4.4.1.0'">4.3.0.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(FSharpCoreBackVersion)' == '3.1' AND '$(FSCoreVersion)' == '4.4.1.0'">4.3.1.0</FSCoreVersion>
-    <FSCoreVersion Condition="'$(FSharpCoreBackVersion)' == '4.0' AND '$(FSCoreVersion)' == '4.4.1.0'">4.4.0.0</FSCoreVersion>
+    <FSCoreVersion>4.4.1.0</FSCoreVersion>
  </PropertyGroup>

  <Choose>
@@ -107,6 +98,7 @@
  </PropertyGroup>  

  <PropertyGroup>
+    <NugetLocalPackagesDir>$(FSharpSourcesRoot)\..\packages</NugetLocalPackagesDir>
    <NUnitVersion>3.5.0</NUnitVersion>
    <NUnitFullVersion>3.5.0.0</NUnitFullVersion>
    <NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
@@ -126,30 +118,6 @@
    <!-- MSbuild works out the assembly references -->
  </PropertyGroup>

-
-  <!-- MonoAndroid, MonoTouch, XamarinWatchOS, XamarinTVOS -->
-  <PropertyGroup Condition="('$(TargetDotnetProfile)'=='monoandroid10+monotouch10+xamarinios10')">
-    <!-- Although Reflection Emit is available on MonoAndroid, we don't use it for FSharp.Core -->
-    <!-- because we want the FSharp.Core DLLs to be identical for MonoAndroid and MonoTouch -->
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
-    <AssemblySearchPaths>$(FSharpSourcesRoot)\..\mono\dependencies\2.1\XamarinWatchOS;$(AssemblySearchPaths)</AssemblySearchPaths>
-
-  </PropertyGroup>
-
-  <!-- Target MonoAndroid -->
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='monoandroid10+monotouch10+xamarinios10'">
-    <AssemblySearchPaths>$(FSharpSourcesRoot)\..\mono\dependencies\2.1\MonoAndroid;$(AssemblySearchPaths)</AssemblySearchPaths>
-
-  </PropertyGroup>
-
-  <!-- Target xamarinmacmobile similar to monoandroid10+monotouch10+xamarinios10 configurations, with Reflection.emit, structural equality, and BigInt -->
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='xamarinmacmobile'">
-    <AssemblySearchPaths>$(FSharpSourcesRoot)\..\mono\dependencies\2.1\XamarinMac;$(AssemblySearchPaths)</AssemblySearchPaths>
-
-  </PropertyGroup>
-
  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='coreclr'">
    <DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
    <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
@@ -221,166 +189,7 @@
    <DOTNET_PUBLISH_FSI_PATH>$(FSharpSourcesRoot)\..\tests\testbin\$(Configuration)\coreclr\FSC</DOTNET_PUBLISH_FSI_PATH>
  </PropertyGroup>

-  <!-- Target Portable Profile 47 -->
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='portable47'">
-    <DefineConstants>$(DefineConstants);FSCORE_PORTABLE_OLD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FSCORE_NO_STDIN</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ASCII_ENCODING</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BASED_ARRAYS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_COMMAND_LINE_ARGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_COMVISIBLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CULTURE_INFO_ARGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEBUG_PROXIES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEFAULT_ENCODING</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DOUBLE_BIT_CONVERTER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ENVIRONMENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_FILE_OPTIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_GET_HASH_CODE_HELPER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ICLONEABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_IOBSERVABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_NONBLOCK_IO</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PROCESS_DIAGNOSTICS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PROCESS_START</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TO_LOWER_INVARIANT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TRUNCATE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WAITONE_MILLISECONDS</DefineConstants>
-    <TargetFrameworkProfile>Profile47</TargetFrameworkProfile>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <!-- Target Portable Profile 7 -->
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='portable7'">
-    <DefineConstants>$(DefineConstants);FSCORE_PORTABLE_NEW</DefineConstants>
-    <DefineConstants>$(DefineConstants);FSCORE_NO_STDIN</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
-    <TargetProfile>netcore</TargetProfile>
-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>    
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='portable78'">
-    <DefineConstants>$(DefineConstants);FSCORE_PORTABLE_NEW</DefineConstants>
-    <DefineConstants>$(DefineConstants);FSCORE_NO_STDIN</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
-    <TargetProfile>netcore</TargetProfile>
-    <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <!-- Target Portable Profile 259 -->
-  <PropertyGroup Condition="'$(TargetDotnetProfile)'=='portable259'">
-    <DefineConstants>$(DefineConstants);FSCORE_PORTABLE_NEW</DefineConstants>
-    <DefineConstants>$(DefineConstants);FSCORE_NO_STDIN</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_PORTABLE_OR_NETSTANDARD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_MISSINGMETHODEXCEPTION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
-    <TargetProfile>netcore</TargetProfile>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <!-- If building an FSharp.Core for a back version (Mono Debian source builds only), put it in a ualified directory -->
+  <!-- If building an FSharp.Core for a back version (Mono Debian source builds only), put it in a qualified directory -->
  <PropertyGroup>
    <TargetFrameworkOutputDirectory Condition="'$(FSharpCoreBackVersion)' == ''">$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
    <TargetFrameworkOutputDirectory Condition="'$(FSharpCoreBackVersion)' == '3.0'">fsharp30\$(TargetDotnetProfile)</TargetFrameworkOutputDirectory>
@@ -412,8 +221,8 @@
        <FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.5\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
      </PropertyGroup>
    </When>
-    <When Condition="'$(BuildWith)' == '' AND ('$(TargetDotnetProfile)'=='portable47' OR '$(TargetDotnetProfile)'=='portable7' OR '$(TargetDotnetProfile)'=='portable78' OR '$(TargetDotnetProfile)'=='portable259' OR '$(TargetDotnetProfile)'=='coreclr')">
-      <!-- Compiling portable/coreclr with Proto, currently always use a .NET Framework/Mono proto -->
+    <When Condition="'$(BuildWith)' == '' AND '$(TargetDotnetProfile)'=='coreclr'">
+      <!-- Compiling coreclr with Proto, currently always use a .NET Framework/Mono proto -->
      <PropertyGroup>
        <OutputPath Condition=" '$(CustomOutputPath)' != 'true' ">$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFrameworkOutputDirectory)\bin</OutputPath>
        <FscToolPath>$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin</FscToolPath>
@@ -463,9 +272,7 @@

    <NuGetToolPath Condition="'$(NuGetToolPath)' == ''">$(FSharpSourcesRoot)\..\.nuget\</NuGetToolPath>
    <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
-
    <NugetRestoreCommand>"$(NuGetToolPath)NuGet.exe install -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)NuGet.Config"</NugetRestoreCommand>
-
    <DnuRestoreCommand>"$(NuGetToolPath)NuGet.exe" restore -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)NuGet.Config"</DnuRestoreCommand>

    <!-- Current version of .NET Core does not support all semantics used in our packages, 

--- a/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
+++ b/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
@@ -16,7 +16,6 @@
    <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
    <Optimize>false</Optimize>
    <Tailcalls>false</Tailcalls>
-    <TargetProfile Condition=" '$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259' ">netcore</TargetProfile>
  </PropertyGroup>
  <PropertyGroup>
    <DefineConstants>$(DefineConstants);EXTENSIONTYPING</DefineConstants>

--- a/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+++ b/src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
@@ -20,7 +20,7 @@
    <!-- Prevent compiler from inlining calls to FSharp.Core to improve code coverage accuracy -->
    <Optimize>false</Optimize>
    <Tailcalls>false</Tailcalls>
-    <TargetProfile Condition=" '$(TargetDotnetProfile)' == 'portable7' or '$(TargetDotnetProfile)' == 'portable78' or '$(TargetDotnetProfile)' == 'portable259' or '$(TargetDotnetProfile)' == 'coreclr' ">netcore</TargetProfile>
+    <TargetProfile Condition=" '$(TargetDotnetProfile)' == 'coreclr' ">netcore</TargetProfile>
    <NoWarn>$(NoWarn);217</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -50,13 +50,9 @@
      <SpecificVersion>true</SpecificVersion>
      <Private>True</Private>
      <HintPath Condition="'$(TargetDotnetProfile)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>
-      <HintPath Condition="'$(TargetDotnetProfile)' == 'portable7'">$(FsCheckLibDir)\portable-net45+netcore45\FsCheck.dll</HintPath>
-      <HintPath Condition="'$(TargetDotnetProfile)' == 'portable78'">$(FsCheckLibDir)\portable-net45+netcore45+wp8\FsCheck.dll</HintPath>
-      <HintPath Condition="'$(TargetDotnetProfile)' == 'portable259'">$(FsCheckLibDir)\portable-net45+netcore45+wpa81+wp8\FsCheck.dll</HintPath>
    </Reference>
    <Reference Include="System.ValueTuple">
-        <HintPath Condition=" '$(TargetDotnetProfile)' == 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-        <HintPath Condition=" '$(TargetDotnetProfile)' != 'profile47' ">..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
+        <HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
        <Private>True</Private>
    </Reference>
  </ItemGroup>
@@ -66,7 +62,7 @@
      <Name>FSharp.Core</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup Condition="(!$(TargetDotnetProfile.Contains('portable'))) and '$(TargetDotnetProfile)' != 'coreclr'">
+  <ItemGroup Condition=" '$(TargetDotnetProfile)' != 'coreclr'">
    <Reference Include="mscorlib" />
    <Reference Include="System" />
    <Reference Include="System.Numerics" Condition="'$(TargetDotnetProfile)' == 'net40'" />
@@ -74,20 +70,20 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="LibraryTestFx.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" Condition=" '$(TargetDotnetProfile)' != 'portable47' " />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule2.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array2Module.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array3Module.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Array4Module.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" Condition=" '$(TargetDotnetProfile)' != 'portable47' " />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayProperties.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ComparisonIdentityModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\HashIdentityModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListModule2.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteListFunctions.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListType.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" Condition=" '$(TargetDotnetProfile)' != 'portable47' " />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ListProperties.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\MapType.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SetModule.fs" />
@@ -95,13 +91,13 @@
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqModule2.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ObsoleteSeqFunctions.fs" />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" Condition=" '$(TargetDotnetProfile)' != 'portable47' " />
-    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition=" '$(TargetDotnetProfile)' != 'portable47' " />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqProperties.fs" />
+    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
    <Compile Include="FSharp.Core\PrimTypes.fs" />
    <Compile Include="FSharp.Core\ComparersRegression.fs" />
-    <Compile Include="FSharp.Core\DiscrimantedUnionType.fs"  Condition="'$(TargetDotnetProfile)' != 'portable47' AND '$(TargetDotnetProfile)' != 'portable78' AND '$(TargetDotnetProfile)' != 'portable259'  AND '$(TargetDotnetProfile)' != 'portable7'"/>
-    <Compile Include="FSharp.Core\RecordTypes.fs" Condition="'$(TargetDotnetProfile)' != 'portable47' AND '$(TargetDotnetProfile)' != 'portable78' AND '$(TargetDotnetProfile)' != 'portable259'  AND '$(TargetDotnetProfile)' != 'portable7'"/>
+    <Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
+    <Compile Include="FSharp.Core\RecordTypes.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />
    <Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversionsGenerated.fs" />

--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable259.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable259.fs
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable47.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable47.fs
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable7.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable7.fs
--- a/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable78.fs
+++ b/src/fsharp/FSharp.Core.Unittests/SurfaceArea.portable78.fs
--- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec
+++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec
@@ -53,20 +53,20 @@
        </dependencies>
    </metadata>
    <files>
-        <file src="dotnet20/bin/FSharp.Core.dll"     target="lib/net20/" />
-        <file src="dotnet20/bin/FSharp.Core.sigdata" target="lib/net20/" />
-        <file src="dotnet20/bin/FSharp.Core.optdata" target="lib/net20/" />
-        <file src="dotnet20/bin/FSharp.Core.xml"     target="lib/net20/" />
+        <file src="profiles/net20/FSharp.Core.dll"     target="lib/net20/" />
+        <file src="profiles/net20/FSharp.Core.sigdata" target="lib/net20/" />
+        <file src="profiles/net20/FSharp.Core.optdata" target="lib/net20/" />
+        <file src="profiles/net20/FSharp.Core.xml"     target="lib/net20/" />

-        <file src="dotnet40/bin/FSharp.Core.dll"     target="lib/net40/" />
-        <file src="dotnet40/bin/FSharp.Core.sigdata" target="lib/net40/" />
-        <file src="dotnet40/bin/FSharp.Core.optdata" target="lib/net40/" />
-        <file src="dotnet40/bin/FSharp.Core.xml"     target="lib/net40/" />
+        <file src="profiles/net40/FSharp.Core.dll"     target="lib/net40/" />
+        <file src="profiles/net40/FSharp.Core.sigdata" target="lib/net40/" />
+        <file src="profiles/net40/FSharp.Core.optdata" target="lib/net40/" />
+        <file src="profiles/net40/FSharp.Core.xml"     target="lib/net40/" />

-        <file src="net40/bin/FSharp.Core.dll"       target="lib/net45/" />
-        <file src="net40/bin/FSharp.Core.sigdata"   target="lib/net45/" />
-        <file src="net40/bin/FSharp.Core.optdata"   target="lib/net45/" />
-        <file src="net40/bin/FSharp.Core.xml"       target="lib/net45/" />
+        <file src="net40/bin/FSharp.Core.dll"     target="lib/net45/" />
+        <file src="net40/bin/FSharp.Core.sigdata" target="lib/net45/" />
+        <file src="net40/bin/FSharp.Core.optdata" target="lib/net45/" />
+        <file src="net40/bin/FSharp.Core.xml"     target="lib/net45/" />

        <file src="coreclr/bin/FSharp.Core.dll"     target="lib/netstandard1.6/" />
        <file src="coreclr/bin/FSharp.Core.sigdata" target="lib/netstandard1.6/" />
@@ -75,35 +75,34 @@
        <file src="coreclr/bin/FSharp.Core.sigdata" target="runtimes/any/native/" />
        <file src="coreclr/bin/FSharp.Core.optdata" target="runtimes/any/native/" />

-        <file src="monoandroid10+monotouch10+xamarinios10/bin/FSharp.Core.dll"      target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
-        <file src="monoandroid10+monotouch10+xamarinios10/bin/FSharp.Core.sigdata"  target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
-        <file src="monoandroid10+monotouch10+xamarinios10/bin/FSharp.Core.optdata"  target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
-        <file src="monoandroid10+monotouch10+xamarinios10/bin/FSharp.Core.xml"      target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
+        <file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.dll"     target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
+        <file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.sigdata" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
+        <file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.optdata" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
+        <file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.xml"     target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />

-        <file src="portable7/bin/FSharp.Core.dll"         target="lib/portable-net45+netcore45/" />
-        <file src="portable7/bin/FSharp.Core.sigdata"     target="lib/portable-net45+netcore45/" />
-        <file src="portable7/bin/FSharp.Core.optdata"     target="lib/portable-net45+netcore45/" />
-        <file src="portable7/bin/FSharp.Core.xml"         target="lib/portable-net45+netcore45/" />
+        <file src="profiles/portable-net45+netcore45/FSharp.Core.dll"     target="lib/portable-net45+netcore45/" />
+        <file src="profiles/portable-net45+netcore45/FSharp.Core.sigdata" target="lib/portable-net45+netcore45/" />
+        <file src="profiles/portable-net45+netcore45/FSharp.Core.optdata" target="lib/portable-net45+netcore45/" />
+        <file src="profiles/portable-net45+netcore45/FSharp.Core.xml"     target="lib/portable-net45+netcore45/" />

-        <file src="portable78/bin/FSharp.Core.dll"        target="lib/portable-net45+netcore45+wp8/" />
-        <file src="portable78/bin/FSharp.Core.sigdata"    target="lib/portable-net45+netcore45+wp8/" />
-        <file src="portable78/bin/FSharp.Core.optdata"    target="lib/portable-net45+netcore45+wp8/" />
-        <file src="portable78/bin/FSharp.Core.xml"        target="lib/portable-net45+netcore45+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.dll"     target="lib/portable-net45+netcore45+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.sigdata" target="lib/portable-net45+netcore45+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.optdata" target="lib/portable-net45+netcore45+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.xml"     target="lib/portable-net45+netcore45+wp8/" />

-        <file src="portable259/bin/FSharp.Core.dll"       target="lib/portable-net45+netcore45+wpa81+wp8/" />
-        <file src="portable259/bin/FSharp.Core.sigdata"   target="lib/portable-net45+netcore45+wpa81+wp8/" />
-        <file src="portable259/bin/FSharp.Core.optdata"   target="lib/portable-net45+netcore45+wpa81+wp8/" />
-        <file src="portable259/bin/FSharp.Core.xml"       target="lib/portable-net45+netcore45+wpa81+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.dll"     target="lib/portable-net45+netcore45+wpa81+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.sigdata" target="lib/portable-net45+netcore45+wpa81+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.optdata" target="lib/portable-net45+netcore45+wpa81+wp8/" />
+        <file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.xml"     target="lib/portable-net45+netcore45+wpa81+wp8/" />

-        <file src="portable47/bin/FSharp.Core.dll"        target="lib/portable-net45+sl5+netcore45/" />
-        <file src="portable47/bin/FSharp.Core.sigdata"    target="lib/portable-net45+sl5+netcore45/" />
-        <file src="portable47/bin/FSharp.Core.optdata"    target="lib/portable-net45+sl5+netcore45/" />
-        <file src="portable47/bin/FSharp.Core.xml"        target="lib/portable-net45+sl5+netcore45/" />
-
-        <file src="xamarinmacmobile/bin/FSharp.Core.dll"     target="lib/xamarinmac20/" />
-        <file src="xamarinmacmobile/bin/FSharp.Core.sigdata" target="lib/xamarinmac20/" />
-        <file src="xamarinmacmobile/bin/FSharp.Core.optdata" target="lib/xamarinmac20/" />
-        <file src="xamarinmacmobile/bin/FSharp.Core.xml"     target="lib/xamarinmac20/" />
+        <file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.dll"     target="lib/portable-net45+sl5+netcore45/" />
+        <file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.sigdata" target="lib/portable-net45+sl5+netcore45/" />
+        <file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.optdata" target="lib/portable-net45+sl5+netcore45/" />
+        <file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.xml"     target="lib/portable-net45+sl5+netcore45/" />

+        <file src="profiles/xamarinmac20/FSharp.Core.dll"     target="lib/xamarinmac20/" />
+        <file src="profiles/xamarinmac20/FSharp.Core.sigdata" target="lib/xamarinmac20/" />
+        <file src="profiles/xamarinmac20/FSharp.Core.optdata" target="lib/xamarinmac20/" />
+        <file src="profiles/xamarinmac20/FSharp.Core.xml"     target="lib/xamarinmac20/" />
    </files>
 </package>
--- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj
+++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj
@@ -34,8 +34,16 @@
  <Target Name="Rebuild"  DependsOnTargets="$(nugetpackfsharpcore)" />
  <Target Name="Clean"    DependsOnTargets="CleanVersionFile" />

+  <Target Name="CopyFiles">
+    <ItemGroup>
+        <Profiles Include="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\*\*.*" 
+                  Exclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\net45\*\*.*;$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.4.1.18\lib\netstandard1.6\*\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Profiles)" DestinationFolder="$(FSharpSourcesRoot)\..\$(Configuration)\profiles\%(RecursiveDir)" />
+  </Target>
+
  <Target Name="nugetpackfsharpcore"
-          DependsOnTargets="CreateOrUpdateBuildVersionFile"
+          DependsOnTargets="CreateOrUpdateBuildVersionFile;CopyFiles"
          AfterTargets="Build"
          Inputs="@(PackageNuspec)" 
          Outputs='$(FSharpSourcesRoot)\$(Configuration)\artifacts\$(PackageMajorVersion)\"%(PackageNuspec.Filename)).nupkg'>

--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -21,13 +21,15 @@
    <AllowCrossTargeting>true</AllowCrossTargeting>
    <FX_NO_LOADER>true</FX_NO_LOADER>
    <OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20   --extraoptimizationloops:1 </OtherFlags>
-    <OtherFlags Condition=" '$(TargetDotnetProfile)'=='net40'">$(OtherFlags)       --compiling-fslib-40</OtherFlags>
-    <OtherFlags Condition=" '$(TargetDotnetProfile)'=='coreclr'">$(OtherFlags)     --compiling-fslib-40</OtherFlags>
-    <OtherFlags Condition=" '$(TargetDotnetProfile)'=='portable7'">$(OtherFlags)   --compiling-fslib-40</OtherFlags>
-    <OtherFlags Condition=" '$(TargetDotnetProfile)'=='portable78'">$(OtherFlags)  --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
-    <OtherFlags Condition=" '$(TargetDotnetProfile)'=='portable259'">$(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint</OtherFlags>
+    <OtherFlags>$(OtherFlags)       --compiling-fslib-40</OtherFlags>
  </PropertyGroup>

+  <!-- Nuget packaging configuration -->
+  <ItemGroup>
+    <PackageNuspec Include="Testing.FSharp.Core.nuspec" Condition="'$(TargetDotnetProfile)' == 'coreclr'" />
+    <None Include="FSharp.Core.runtimeconfig.json"      Condition="'$(TargetDotnetProfile)' == 'coreclr'" ><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
+  </ItemGroup>
+
  <ItemGroup>
    <FilesToLocalize Include="$(OutDir)$(AssemblyName).dll">
      <TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
@@ -36,6 +38,7 @@
      <InProject>false</InProject>
    </FilesToLocalize>
  </ItemGroup>
+
  <ItemGroup>
    <CustomAdditionalCompileInputs Include="$(FSharpSourcesRoot)\..\Proto\$(ProtoFlavour)\bin\fsc-proto.exe">
      <Visible>false</Visible>
@@ -224,25 +227,15 @@
      <Link>assemblyinfo.FSharp.Core.dll.fs</Link>
    </Compile>
  </ItemGroup>
-  <ItemGroup Condition="'$(TargetDotnetProfile)' != 'portable7' and '$(TargetDotnetProfile)' != 'coreclr'">
+
+  <ItemGroup Condition="'$(TargetDotnetProfile)' != 'coreclr'">
    <Reference Include="mscorlib" />
    <Reference Include="System" />
-    <Reference Include="System.Numerics" Condition="'$(TargetDotnetProfile)' == 'net40' OR 
-                                                    '$(TargetDotnetProfile)' == 'monoandroid10+monotouch10+xamarinios10' OR
-                                                    '$(TargetDotnetProfile)' == 'xamarinmacmobile'" >
-      <Private>false</Private>
-    </Reference>
-	<Reference Include="System.Net" Condition="'$(TargetDotnetProfile)' == 'portable47' OR 
-                                               '$(TargetDotnetProfile)' == 'portable7'" >
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="System.Core" Condition="'$(TargetDotnetProfile)' == 'monoandroid10+monotouch10+xamarinios10' OR 
-                                                '$(TargetDotnetProfile)' == 'portable47' OR 
-                                                '$(TargetDotnetProfile)' == 'portable7' OR
-                                                '$(TargetDotnetProfile)' == 'xamarinmacmobile'" >
+    <Reference Include="System.Numerics">
      <Private>false</Private>
    </Reference>
  </ItemGroup>
+
  <ItemGroup Condition="'$(TargetDotnetProfile)' == 'coreclr'">
    <None Include="project.json" />
  </ItemGroup>
@@ -263,7 +256,7 @@
    <Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
    <Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
  </Target>
-  
+
  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
@@ -275,4 +268,20 @@
    </ItemGroup>
  </Target>

+  <Target Name="nugetpack"
+          DependsOnTargets="CreateOrUpdateBuildVersionFile"
+          AfterTargets="Build"
+          Condition="'$(TargetDotnetProfile)' == 'coreclr' "
+          Inputs="@(PackageNuspec)" 
+          Outputs='$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'>
+
+    <PropertyGroup>
+      <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42Version)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(FSharpSourcesRoot)\..\artifacts" />
+    <SetEnvVar Name="NUGET_PACKAGES" Value="$(NUGET_PACKAGES)" />
+    <Exec Command='$(FSharpSourcesRoot)\..\.nuget\nuget.exe pack @(PackageNuspec) -BasePath $(OutputPath.TrimEnd("\")) -ExcludeEmptyDirectories $(PackageProperties) -OutputDirectory $(FSharpSourcesRoot)\..\artifacts' />
+  </Target>
+
 </Project>
--- a/src/fsharp/FSharp.Core/FSharp.Core.netcore.nuspec
+++ b/src/fsharp/FSharp.Core/FSharp.Core.netcore.nuspec
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
    <metadata>
-        <id>FSharp.Core.netcore</id>
+        <id>Testing.FSharp.Core</id>
        <description>
            .NET Core compatible version of the fsharp core library FSharp.Core.dll
            Supported Platforms: - .NET Core (netstandard1.6)

--- a/tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/project.json
+++ b/tests/fsharp/FSharp.Tests.FSharpSuite.DrivingCoreCLR/project.json
@@ -7,7 +7,7 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.6.1",
-    "FSharp.Core": "4.2.*",
+    "Testing.FSharp.Core": "4.2.*",
    "nunit": "3.5.0",
    "nunitlite": "3.5.0"
  },