Update BuildTools, CoreClr to preview4-03917-01, preview5-27618-71, r…

…espectively (master) (#24060) * Update BuildTools, CoreClr to preview4-03917-01, preview5-27618-71, respectively * Fix build errors * Disable warning with pragma and linked issue
dotnet · Apr 21, 2019 · 472d840 · 472d840
1 parent 31c69e1
commit 472d840
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-3.0.0-preview4-03913-01
+3.0.0-preview4-03917-01
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
@@ -1 +1 @@
-3.0.0-preview5-27616-71
+3.0.0-preview5-27618-71
diff --git a/dependencies.props b/dependencies.props
@@ -26,13 +26,13 @@
 
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreClrCurrentRef>64388f5ec335146136dea340002316fed53df6a9</CoreClrCurrentRef>
-    <BuildToolsCurrentRef>c6a0e8080e10e8940af6b1d1809e79fdd8de55b7</BuildToolsCurrentRef>
+    <CoreClrCurrentRef>c759329d47d7e871483ef1747803839b31f2f31d</CoreClrCurrentRef>
+    <BuildToolsCurrentRef>c759329d47d7e871483ef1747803839b31f2f31d</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview5-27616-71</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview5-27618-71</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.40</MicrosoftDiagnosticsTracingTraceEventPackageVersion>

diff --git a/src/System.Private.CoreLib/shared/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs b/src/System.Private.CoreLib/shared/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs
@@ -247,7 +247,7 @@ public bool Trim()
                 // Under high pressure, release all thread locals
                 if (log.IsEnabled())
                 {
-                    foreach (KeyValuePair<T[]?[], object> tlsBuckets in s_allTlsBuckets)
+                    foreach (KeyValuePair<T[]?[], object?> tlsBuckets in s_allTlsBuckets)
                     {
                         T[]?[] buckets = tlsBuckets.Key;
                         for (int i = 0; i < buckets.Length; i++)

diff --git a/src/System.Private.CoreLib/shared/System/Resources/ResourceManager.cs b/src/System.Private.CoreLib/shared/System/Resources/ResourceManager.cs
@@ -304,7 +304,9 @@ public virtual void ReleaseAllResources()
 
             lock (localResourceSets)
             {
+#pragma warning disable CS8619 // TODO-NULLABLE: https://github.com/dotnet/roslyn/issues/35131
                 foreach ((_, ResourceSet resourceSet) in localResourceSets)
+#pragma warning restore CS8619
                 {
                     resourceSet.Close();
                 }

diff --git a/src/System.Private.CoreLib/shared/System/Threading/AsyncLocal.cs b/src/System.Private.CoreLib/shared/System/Threading/AsyncLocal.cs
@@ -465,7 +465,7 @@ public IAsyncLocalValueMap Set(IAsyncLocal key, object? value, bool treatNullVal
                     {
                         var multi = new MultiElementAsyncLocalValueMap(MultiElementAsyncLocalValueMap.MaxMultiElements);
                         int index = 0;
-                        foreach (KeyValuePair<IAsyncLocal, object> pair in this)
+                        foreach (KeyValuePair<IAsyncLocal, object?> pair in this)
                         {
                             if (!ReferenceEquals(key, pair.Key))
                             {