Merge in 'release/2.1.5xx' changes

Author: dotnet-bot

.vsts-ci.yml

@@ -126,25 +126,6 @@ jobs:
       testResultsFiles: '**/*.trx'
     condition: always()
 
-- job: debug_rhel6_x64
-  displayName: RHEL6 x64 Debug Build
-  timeoutInMinutes: 90
-  pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: NetCorePublic-Pool
-      queue: BuildPool.Ubuntu.1604.Amd64.Open
-    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-      name: NetCoreInternal-Pool
-      queue: BuildPool.Ubuntu.1604.Amd64
-    vmImage: ubuntu-16.04
-  steps:
-  - script: ./build.sh --skip-prereqs --configuration Debug --targets Default --runtime-id rhel.6-x64 --docker rhel.6
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**/*.trx'
-    condition: always()
-
 - job: debug_ubuntu1604_x64
   displayName: Ubuntu16.04 x64 Debug Build
   pool:

build/Version.props

@@ -3,7 +3,7 @@
     <VersionMajor>2</VersionMajor>
     <VersionMinor>1</VersionMinor>
     <FeatureBand>500</FeatureBand>
-    <PatchLevel>20</PatchLevel>
+    <PatchLevel>21</PatchLevel>
     <VersionPatch>$([MSBuild]::Add($(FeatureBand),$(PatchLevel)))</VersionPatch>
 
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>