Build working on non-Windows after merging master

build.cmd

@@ -6,9 +6,7 @@ if /I [%1] == [-?] goto Usage
 :Build
 call %~dp0build-native.cmd %*
 if NOT [%ERRORLEVEL%]==[0] exit /b 1
-call %~dp0build-managed.cmd -FilterToOSGroup=Windows_NT %*
-if NOT [%ERRORLEVEL%]==[0] exit /b 1
-call %~dp0build-tests.cmd %*
+call %~dp0build-managed.cmd %*
 exit /b %ERRORLEVEL%
 
 :Usage

build.sh

@@ -23,57 +23,10 @@ fi
 
 __scriptpath=$(cd "$(dirname "$0")"; pwd -P)
 
-__ServerGC=0
-__IsCentos=0
-__IsOSX=0
-
-while :; do
-    if [ $# -le 0 ]; then
-        break
-    fi
-
-    if [[ $1 == *"centos.7"* ]] ; then
-       __IsCentos=1
-    fi
-
-    if [[ $1 == *"osx.10"* ]] ; then
-       __IsOSX=1
-    fi
-
-    lowerI="$(echo $1 | awk '{print tolower($0)}')"
-    case $lowerI in
-        useservergc)
-            __ServerGC=1
-            ;;
-        *)
-    __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
-    esac
-
-    shift
-done
-
-export CORECLR_SERVER_GC="$__ServerGC"
-
-"$__scriptpath/build-native.sh" $__UnprocessedBuildArgs
-if [ $? -ne 0 ];then
-   exit 1
-fi
-
-if [ $__IsCentos -eq 1 ] ; then
-   "$__scriptpath/build-packages.sh" -DisableManagedPackage -FilterToOSGroup=rhel.7 $__UnprocessedBuildArgs
-elif [ $__IsOSX -eq 1 ] ; then
-   "$__scriptpath/build-packages.sh" -DisableManagedPackage -FilterToOSGroup=osx.10 $__UnprocessedBuildArgs
-else
-   "$__scriptpath/build-packages.sh" -DisableManagedPackage $__UnprocessedBuildArgs
-fi
-if [ $? -ne 0 ];then
-   exit 1
-fi
-
-"$__scriptpath/build-managed.sh" $__UnprocessedBuildArgs
+"$__scriptpath/build-native.sh" $*
 if [ $? -ne 0 ];then
    exit 1
 fi
 
-"$__scriptpath/build-tests.sh" $__UnprocessedBuildArgs
+"$__scriptpath/build-managed.sh" $*
 exit $?

src/System.Net.HttpListener/src/System.Net.HttpListener.csproj

@@ -332,6 +332,9 @@
     <Compile Include="System\Net\Managed\ChunkedInputStream.cs" />
     <Compile Include="System\Net\Managed\ChunkStream.cs" />
     <Compile Include="System\Net\Managed\HttpResponseStream.Managed.cs" />
+    <Reference Include="System.Net.Sockets" />
+    <Reference Include="System.Threading.ThreadPool" />
+    <Reference Include="System.Net.ServicePoint" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(ProjectJson)' == '' ">
     <ProjectJson>win/project.json</ProjectJson>

src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj

@@ -148,7 +148,7 @@
     <Reference Include="System.Security.Cryptography.Primitives" />
     <Reference Include="System.Text.Encoding.Extensions" />
     <Reference Include="System.Threading.Timer" />
-
+    <Reference Include="System.Buffers" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>