Merge in 'release/6.0.1xx' changes

build.sh

@@ -53,7 +53,5 @@ dockerbuild()
 if [ ! -z "$BUILD_IN_DOCKER" ]; then
     dockerbuild $args
 else
-    # Run under sudo so we can set ulimit
-    # See https://github.com/dotnet/core-eng/issues/14808
-    sudo -E $DIR/run-build.sh $args
+    $DIR/run-build.sh $args
 fi

run-build.sh

@@ -25,10 +25,6 @@ CUSTOM_BUILD_ARGS=
 # Set nuget package cache under the repo
 [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
 
-# Set max number of files open, helps avoid errors during NuGet restore
-# See https://github.com/dotnet/core-eng/issues/14808
-ulimit -n 16384
-
 args=( )
 
 while [[ $# > 0 ]]; do