Update branding for 3.1.5

.azure-ci.yml

@@ -57,30 +57,42 @@ variables:
       value: .NETCore
     - name: _DotNetValidationArtifactsCategory
       value: .NETCore
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - group: DotNet-MSRC-Storage
+    - name: _InternalRuntimeDownloadArgs
+      value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
+             /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
+  - ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    - name: _InternalRuntimeDownloadArgs
+      value: ''
 
 stages:
   # Windows legs
   - template: /eng/pipelines/windows.yml
     parameters:
       isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
+      isInternalBuild: ${{ ne(variables['System.TeamProject'], 'public') }}
       fullMatrix: true
 
   # Linux legs
   - template: /eng/pipelines/linux.yml
     parameters:
       isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
+      isInternalBuild: ${{ ne(variables['System.TeamProject'], 'public') }}
       fullMatrix: true
 
   # MacOS legs
   - template: /eng/pipelines/macos.yml
     parameters:
       isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
+      isInternalBuild: ${{ ne(variables['System.TeamProject'], 'public') }}
       fullMatrix: true
 
     # FreeBSD leg is only for official builds
     # - template: /eng/pipelines/freebsd.yml
     #   parameters:
     #     isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
+    #     isInternalBuild: ${{ ne(variables['System.TeamProject'], 'public') }}
     #     fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
 
   # Publish and validation steps. Only run in official builds

eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20202.1">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>83c2d68edf0cc18cf06b12fb2d7eb41031676a3f</Sha>
+      <Sha>05e3582c126663120b82a2eec8fd12dcb6929064</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.4-servicing.20202.1">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>83c2d68edf0cc18cf06b12fb2d7eb41031676a3f</Sha>
+      <Sha>05e3582c126663120b82a2eec8fd12dcb6929064</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20176.1">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.4-servicing.20202.1">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>83c2d68edf0cc18cf06b12fb2d7eb41031676a3f</Sha>
+      <Sha>05e3582c126663120b82a2eec8fd12dcb6929064</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET Core product branding version -->
-    <ProductVersion>3.1.4</ProductVersion>
+    <ProductVersion>3.1.5</ProductVersion>
     <!-- We need to move to 4.7 as part of our versioning change when we switch to arcade to avoid downgrading versions -->
     <MajorVersion>4</MajorVersion>
     <MinorVersion>7</MinorVersion>
@@ -51,9 +51,9 @@
     <MicrosoftNETCoreDotNetHostPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
     <!-- Coreclr dependencies -->
-    <MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETSdkILPackageVersion>
-    <MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreILAsmPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20176.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETSdkILPackageVersion>3.1.4-servicing.20202.1</MicrosoftNETSdkILPackageVersion>
+    <MicrosoftNETCoreILAsmPackageVersion>3.1.4-servicing.20202.1</MicrosoftNETCoreILAsmPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.4-servicing.20202.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <!-- Corefx dependencies -->
     <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
     <runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>

eng/pipelines/corefx-base.yml

@@ -129,6 +129,25 @@ jobs:
           - ${{ if ne(job.preBuildSteps[0], '') }}:
             - ${{ job.preBuildSteps }}
 
+          - ${{ if eq(parameters.isInternalBuild, 'true') }}:
+            - ${{ if eq(parameters.targetOS, 'Windows_NT') }}:
+              - task: PowerShell@2
+                displayName: Setup Private Feeds Credentials
+                inputs:
+                  filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+                  arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+                env:
+                  Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+            - ${{ if ne(parameters.targetOS, 'Windows_NT') }}:
+              - task: Bash@3
+                displayName: Setup Private Feeds Credentials
+                inputs:
+                  filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+                  arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+                env:
+                  Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
           - script: $(_buildScript) -restore $(_commonArguments)
             displayName: Restore Build Tools
 
@@ -143,7 +162,7 @@ jobs:
                 nugetConfigPath: 'eng/internal/NuGet.config'
                 restoreDirectory: '$(Build.SourcesDirectory)\.packages'
                 verbosityRestore: 'normal'
-                externalFeedCredentials: 'dotnet-core-internal-tooling'
+                externalFeedCredentials: 'dotnet-core-internal-tooling'              
 
           - ${{ if eq(job.customBuildSteps[0], '') }}:
             - script: $(_buildScript)
@@ -152,6 +171,7 @@ jobs:
                     $(_commonArguments)
                     $(_testScopeArg)
                     $(_msbuildCommonParameters)
+                    $(_InternalRuntimeDownloadArgs)
               displayName: Build Sources and Tests
 
           - ${{ if ne(job.customBuildSteps[0], '') }}:

eng/pipelines/freebsd.yml

@@ -14,6 +14,7 @@ jobs:
 - template: corefx-base.yml
   parameters:
     isOfficialBuild: ${{ parameters.isOfficialBuild }}
+    isInternalBuild: ${{ parameters.isInternalBuild }}
     testScope: ${{ parameters.testScope }}
     targetOS: FreeBSD
     jobs:

eng/pipelines/linux.yml

@@ -18,6 +18,7 @@ stages:
   - template: corefx-base.yml
     parameters:
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
+      isInternalBuild: ${{ parameters.isInternalBuild }}
       testScope: ${{ parameters.testScope }}
       targetOS: Linux
       jobs:

eng/pipelines/macos.yml

@@ -18,6 +18,7 @@ stages:
   - template: corefx-base.yml
     parameters:
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
+      isInternalBuild: ${{ parameters.isInternalBuild }}
       testScope: ${{ parameters.testScope }}
       targetOS: OSX
       jobs:

eng/pipelines/pre-publish.yml

@@ -51,6 +51,14 @@ stages:
                 artifactName: packages
                 downloadPath: $(_artifactsDir)
 
+            - task: PowerShell@2
+              displayName: Setup Private Feeds Credentials
+              inputs:
+                filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+                arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+              env:
+                Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
             - script: build.cmd
                       -restore
                       -ci

eng/pipelines/windows.yml

@@ -19,6 +19,7 @@ stages:
   - template: corefx-base.yml
     parameters:
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
+      isInternalBuild: ${{ parameters.isInternalBuild }}
       testScope: ${{ parameters.testScope }}
       targetOS: Windows_NT
       jobs:
@@ -171,6 +172,7 @@ stages:
                       /p:RuntimeOS=win10
                       /p:ArchiveTests=Packages
                       $(_msbuildCommonParameters)
+                      $(_InternalRuntimeDownloadArgs)
               displayName: Build Packages and Tests
 
         # Legs without HELIX testing

global.json

@@ -12,6 +12,6 @@
     "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.20213.4",
     "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.20213.4",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "3.1.4-servicing.20176.1"
+    "Microsoft.NET.Sdk.IL": "3.1.4-servicing.20202.1"
   }
 }

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -23,7 +23,8 @@
     "Microsoft.Bcl.AsyncInterfaces": {
       "StableVersions": [
         "1.0.0",
-        "1.1.0"
+        "1.1.0",
+        "1.1.1"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -191,7 +192,7 @@
         "2.2.1",
         "2.2.2",
         "3.0.0",
-        "3.1.0"
+        "3.1.1"
       ],
       "BaselineVersion": "3.0.0",
       "InboxOn": {}
@@ -430,7 +431,8 @@
         "1.0.0",
         "2.0.0",
         "2.1.0",
-        "2.2.0"
+        "2.2.0",
+        "2.2.1"
       ],
       "BaselineVersion": "2.2.0",
       "InboxOn": {},
@@ -890,7 +892,8 @@
         "1.4.0",
         "1.5.0",
         "1.6.0",
-        "1.7.0"
+        "1.7.0",
+        "1.7.1"
       ],
       "BaselineVersion": "1.7.1",
       "InboxOn": {
@@ -1205,7 +1208,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "1.4.0"
+        "1.4.0",
+        "1.4.1"
       ],
       "BaselineVersion": "1.4.0",
       "InboxOn": {}
@@ -1216,7 +1220,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "1.4.0"
+        "1.4.0",
+        "1.4.1"
       ],
       "BaselineVersion": "1.4.1",
       "InboxOn": {},
@@ -1234,7 +1239,8 @@
         "1.1.0",
         "1.2.0",
         "1.3.0",
-        "1.4.0"
+        "1.4.0",
+        "1.4.1"
       ],
       "BaselineVersion": "1.4.0",
       "InboxOn": {},
@@ -1476,7 +1482,8 @@
     "System.Data.OleDb": {
       "StableVersions": [
         "4.6.0",
-        "4.7.0"
+        "4.7.0",
+        "4.7.1"
       ],
       "BaselineVersion": "4.7.0",
       "InboxOn": {},
@@ -6598,4 +6605,4 @@
       "System.Xml.XDocument"
     ]
   }
-}
+}

src/System.Private.DataContractSerialization/src/System/Xml/XmlBufferReader.cs

@@ -213,28 +213,36 @@ private bool TryEnsureBytes(int count)
         {
             if (_stream == null)
                 return false;
-            DiagnosticUtility.DebugAssert(_offset <= int.MaxValue - count, "");
-            int newOffsetMax = _offset + count;
-            if (newOffsetMax < _offsetMax)
-                return true;
-            DiagnosticUtility.DebugAssert(newOffsetMax <= _windowOffsetMax, "");
-            if (newOffsetMax > _buffer.Length)
-            {
-                byte[] newBuffer = new byte[Math.Max(newOffsetMax, _buffer.Length * 2)];
-                System.Buffer.BlockCopy(_buffer, 0, newBuffer, 0, _offsetMax);
-                _buffer = newBuffer;
-                _streamBuffer = newBuffer;
-            }
-            int needed = newOffsetMax - _offsetMax;
-            while (needed > 0)
+
+            // The data could be coming from an untrusted source, so we use a standard
+            // "multiply by 2" growth algorithm to avoid overly large memory utilization.
+            // Constant value of 256 comes from MemoryStream implementation.
+
+            do
             {
-                int actual = _stream.Read(_buffer, _offsetMax, needed);
-                if (actual == 0)
-                    return false;
-                _offsetMax += actual;
-                needed -= actual;
-            }
-            return true;
+                DiagnosticUtility.DebugAssert(_offset <= int.MaxValue - count, "");
+                int newOffsetMax = _offset + count;
+                if (newOffsetMax <= _offsetMax)
+                    return true;
+                DiagnosticUtility.DebugAssert(newOffsetMax <= _windowOffsetMax, "");
+                if (newOffsetMax > _buffer.Length)
+                {
+                    byte[] newBuffer = new byte[Math.Max(256, _buffer.Length * 2)];
+                    System.Buffer.BlockCopy(_buffer, 0, newBuffer, 0, _offsetMax);
+                    newOffsetMax = Math.Min(newOffsetMax, newBuffer.Length);
+                    _buffer = newBuffer;
+                    _streamBuffer = newBuffer;
+                }
+                int needed = newOffsetMax - _offsetMax;
+                while (needed > 0)
+                {
+                    int actual = _stream.Read(_buffer, _offsetMax, needed);
+                    if (actual == 0)
+                        return false;
+                    _offsetMax += actual;
+                    needed -= actual;
+                }
+            } while (true);
         }
 
         public void Advance(int count)