Merge pull request #12590 from dotnet/marcpopMSFT-60100servicing

Update branding for servicing and 101

build.sh

@@ -53,5 +53,5 @@ dockerbuild()
 if [ ! -z "$BUILD_IN_DOCKER" ]; then
     dockerbuild $args
 else
-    $DIR/run-build.sh $args
+    sudo $DIR/run-build.sh $args
 fi

eng/Versions.props

@@ -8,9 +8,9 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
-    <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->

run-build.sh

@@ -25,6 +25,9 @@ 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
+ulimit -n 16384
+
 args=( )
 
 while [[ $# > 0 ]]; do

src/redist/targets/GenerateBundledVersions.targets

@@ -26,8 +26,8 @@
 
   <PropertyGroup>
       <VersionFeature21>30</VersionFeature21>
-      <VersionFeature31>21</VersionFeature31>
-      <VersionFeature50>12</VersionFeature50>
+      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 21))</VersionFeature31>
+      <VersionFeature50>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature50>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">