Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26515-05, preview1-26515-04, preview1-26515-01, beta-26515-00, beta-26515-00, respectively (master) by dotnet-maestro-bot · Pull Request #29702 · dotnet/corefx

dotnet-maestro-bot · 2018-05-15T01:20:29Z

No description provided.

dotnet-maestro-bot · 2018-05-15T01:50:10Z

Discarded e25f660: Update CoreClr, CoreSetup to preview1-26515-01, preview1-26514-05, respectively

CI Status: 7:x: 4:hourglass: 3:heavy_check_mark: (click to expand)

❌ Linux arm Release Build Build finished. Details
❌ Linux arm64 Release Build Build finished. Details
❌ Linux x64 Release Build Build finished. Details
❌ Linux-musl x64 Debug Build Build finished. Details
❌ UWP CoreCLR x64 Debug Build Build finished. Details
❌ Windows x64 Debug Build Build finished. Details
❌ Windows x86 Release Build Build finished. Details
⌛ NETFX x86 Release Build Started Details
⌛ OSX x64 Debug Build Started Details
⌛ Packaging All Configurations x64 Debug Build Started Details
⌛ UWP NETNative x86 Release Build Started Details
✔️ CROSS Check Build finished. Details
✔️ license/cla All CLA requirements met. Details
✔️ WIP ready for review Details

dotnet-maestro-bot · 2018-05-15T05:16:31Z

Discarded e26869c: Update CoreClr, CoreFx, CoreSetup to preview1-26515-01, preview1-26515-01, preview1-26514-05, respectively

CI Status: 9:x: 5:heavy_check_mark: (click to expand)

❌ Linux arm Release Build Build finished. Details
❌ Linux arm64 Release Build Build finished. Details
❌ Linux x64 Release Build Build finished. Details
❌ Linux-musl x64 Debug Build Build finished. Details
❌ OSX x64 Debug Build Build finished. Details
❌ Packaging All Configurations x64 Debug Build Build finished. Details
❌ UWP CoreCLR x64 Debug Build Build finished. Details
❌ Windows x64 Debug Build Build finished. Details
❌ Windows x86 Release Build Build finished. Details
✔️ CROSS Check Build finished. Details
✔️ license/cla All CLA requirements met. Details
✔️ NETFX x86 Release Build Build finished. Details
✔️ UWP NETNative x86 Release Build Build finished. Details
✔️ WIP ready for review Details

dotnet-maestro-bot · 2018-05-15T06:01:52Z

Discarded d884e87: Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-26515-01, preview1-26515-01, preview1-26514-05, beta-26515-00, beta-26515-00, respectively

CI Status: 8:x: 2:hourglass: 4:heavy_check_mark: (click to expand)

❌ Linux arm Release Build Build finished. Details
❌ Linux arm64 Release Build Build finished. Details
❌ Linux x64 Release Build Build finished. Details
❌ Linux-musl x64 Debug Build Build finished. Details
❌ Packaging All Configurations x64 Debug Build Build finished. Details
❌ UWP CoreCLR x64 Debug Build Build finished. Details
❌ Windows x64 Debug Build Build finished. Details
❌ Windows x86 Release Build Build finished. Details
⌛ NETFX x86 Release Build Started Details
⌛ OSX x64 Debug Build Started Details
✔️ CROSS Check Build finished. Details
✔️ license/cla All CLA requirements met. Details
✔️ UWP NETNative x86 Release Build Build finished. Details
✔️ WIP ready for review Details

dotnet-maestro-bot · 2018-05-15T13:55:39Z

Discarded 998f2fe: Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26515-01, preview1-26515-01, preview1-26515-01, beta-26515-00, beta-26515-00, respectively

CI Status: 11:x: 3:heavy_check_mark: (click to expand)

❌ Linux arm Release Build Build finished. Details
❌ Linux arm64 Release Build Build finished. Details
❌ Linux x64 Release Build Build finished. Details
❌ Linux-musl x64 Debug Build Build finished. Details
❌ NETFX x86 Release Build Build finished. Details
❌ OSX x64 Debug Build Build finished. Details
❌ Packaging All Configurations x64 Debug Build Build finished. Details
❌ UWP CoreCLR x64 Debug Build Build finished. Details
❌ UWP NETNative x86 Release Build Build finished. Details
❌ Windows x64 Debug Build Build finished. Details
❌ Windows x86 Release Build Build finished. Details
✔️ CROSS Check Build finished. Details
✔️ license/cla All CLA requirements met. Details
✔️ WIP ready for review Details

jkotas · 2018-05-15T14:48:16Z

@maryamariyan I assume that this needs your ConcurrentQueue changes

dotnet-maestro-bot · 2018-05-15T15:38:55Z

Discarded 0dda5bc: Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26515-05, preview1-26515-01, preview1-26515-01, beta-26515-00, beta-26515-00, respectively

CI Status: 10:x: 4:heavy_check_mark: (click to expand)

❌ Linux arm Release Build Build finished. Details
❌ Linux arm64 Release Build Build finished. Details
❌ Linux x64 Release Build Build finished. Details
❌ Linux-musl x64 Debug Build Build finished. Details
❌ NETFX x86 Release Build Build finished. Details
❌ OSX x64 Debug Build Build finished. Details
❌ Packaging All Configurations x64 Debug Build Build finished. Details
❌ UWP CoreCLR x64 Debug Build Build finished. Details
❌ Windows x64 Debug Build Build finished. Details
❌ Windows x86 Release Build Build finished. Details
✔️ CROSS Check Build finished. Details
✔️ license/cla All CLA requirements met. Details
✔️ UWP NETNative x86 Release Build Build finished. Details
✔️ WIP ready for review Details

…fsTestILC to preview1-02815-01, preview1-26515-05, preview1-26515-04, preview1-26515-01, beta-26515-00, beta-26515-00, respectively

maryamariyan · 2018-05-15T15:41:19Z

@jkotas thanks. I'm looking at this.

jkotas · 2018-05-15T18:08:44Z

+    <Compile Include="$(CommonPath)\CoreLib\Internal\Padding.cs">
+      <Link>Common\CoreLib\Internal\Padding.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\CoreLib\System\Collections\Concurrent\ConcurrentQueue_Segment.cs">


Is ConcurrentQueue_Segment really needed here?

It shouldn't be. It should only be needed by ConcurrentQueue, which isn't here any more.

yes. I removed it. Will push up the PR along with a fix for the tests

maryamariyan · 2018-05-15T18:45:33Z

@jkotas I'm working on fixing the failing tests.

System.MissingMethodException : Constructor on type 'System.Collections.Concurrent.ProducerConsumerCollectionDebugView`1[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]' not found.

Should be a straightforward fix

jkotas · 2018-05-15T18:50:31Z

    /// </para>
    /// </remarks>
-    [DebuggerTypeProxy(typeof(IProducerConsumerCollectionDebugView<>))]
+    [DebuggerTypeProxy(typeof(ProducerConsumerCollectionDebugView<>))]


Would a better name for this be IProducerConsumerCollectionDebugView? It would match convention that we are using in other places (ICollectionDebugView, IDictionaryDebugView, ...).

That fix will have to go in coreclr

It does not need to go in coreclr first. You can make it in corefx and let the mirror to bring it over to CoreCLR.

I see. Will go ahead then.

jkotas · 2018-05-15T18:57:13Z

    <Compile Include="System\Net\Http\SocketsHttpHandler\RedirectHandler.cs" />
-    <Compile Include="$(CommonPath)\System\Collections\Concurrent\ConcurrentQueue_Segment.cs">
-      <Link>Common\System\Collections\Concurrent\ConcurrentQueue_Segment.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Internal\Padding.cs">


Padding.cs from CoreLib has ARM64-specific ifdefs, but the corefx libraries are not compiled machine specific. We may want to keep a different Padding.cs for corefx with no ifdefs and conservative size that is not machine specific.

How do you recommend I approach this?

Have a different Padding.cs for CoreFX without ifdefs for now.

More discussion about this is in #22724

stephentoub · 2018-05-15T19:01:35Z

-                ConcurrentQueue<ConnectEventArgs>.Segment.RoundUpToPowerOf2(Math.Max(2, Environment.ProcessorCount)));
+        private static readonly Segment<ConnectEventArgs> s_connectEventArgs =
+            new Segment<ConnectEventArgs>(
+                Segment<ConnectEventArgs>.RoundUpToPowerOf2(Math.Max(2, Environment.ProcessorCount)));


I didn't notice this in the coreclr PR, but "Segment" is too generic a name for this. When it was a nested type, it made sense, but now that it's not, we should rename it to something else, either ConcurrentQueueSegment or BoundedConcurrentQueue or something like that.

dotnet-maestro-bot · 2018-05-15T20:32:08Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26515-05, preview1-26515-04, preview1-26515-04, beta-26516-00, beta-26516-00, respectively'

dotnet-maestro-bot · 2018-05-16T00:50:59Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26516-01, preview1-26515-04, preview1-26515-04, beta-26516-00, beta-26516-00, respectively'

jkotas · 2018-05-16T01:38:53Z

  </ItemDefinitionGroup>
  <ItemGroup>
    <Compile Include="$(MSBuildThisFileDirectory)Internal\IO\File.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Internal\Padding.cs" />


This should stay here.

jkotas · 2018-05-16T01:39:22Z

@@ -6,21 +6,15 @@

 namespace Internal


This should be copy, not rename.

jkotas · 2018-05-16T01:40:26Z

@@ -4,6 +4,8 @@
    <BuildConfigurations>
      netcoreapp;


We should not need netcoreapp build configuration now that we have netcoreapp--Window_NT and netcoreapp-Unix configurations.

jkotas · 2018-05-16T01:41:11Z

    <Compile Include="System\Collections\Concurrent\CDSCollectionETWBCLProvider.cs" />
    <Compile Include="System\Collections\Concurrent\ConcurrentBag.cs" />
    <Compile Include="System\Collections\Concurrent\ConcurrentDictionary.cs" />
-    <Compile Include="System\Collections\Concurrent\ConcurrentQueue.cs" />


You will need to keep these .cs files in for uapaot build until the change propagates to ProjectN.

dotnet-maestro-bot · 2018-05-16T05:15:13Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26516-01, preview1-26515-04, preview1-26515-04, beta-26516-01, beta-26516-01, respectively'

dotnet-maestro-bot · 2018-05-16T13:25:52Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26516-05, preview1-26515-04, preview1-26516-01, beta-26516-01, beta-26516-01, respectively'

maryamariyan · 2018-05-16T17:42:10Z

@dotnet-bot test UWP NETNative x86 Release Build

Fixes: dotnet/coreclr#17751

dotnet-maestro-bot · 2018-05-17T00:47:07Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26517-01, preview1-26515-04, preview1-26516-04, beta-26516-01, beta-26516-01, respectively'

dotnet-maestro-bot · 2018-05-17T01:29:26Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26517-01, preview1-26517-01, preview1-26516-04, beta-26516-01, beta-26516-01, respectively'

dotnet-maestro-bot · 2018-05-17T05:15:15Z

Couldn't update this pull request: Head commit author 'Maryam Ariyan' is not 'dotnet-maestro-bot'
Would have applied 'Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02815-01, preview1-26517-01, preview1-26517-01, preview1-26516-04, beta-26517-00, beta-26517-00, respectively'

jkotas · 2018-05-17T05:29:16Z

Closing to pick up CoreCLR update

dotnet-maestro-bot changed the title ~~Update CoreClr, CoreSetup to preview1-26515-01, preview1-26514-05, respectively (master)~~ Update CoreClr, CoreFx, CoreSetup to preview1-26515-01, preview1-26515-01, preview1-26514-05, respectively (master) May 15, 2018

dotnet-maestro-bot force-pushed the master-UpdateDependencies branch from e25f660 to e26869c Compare May 15, 2018 01:50

dotnet-maestro-bot force-pushed the master-UpdateDependencies branch from e26869c to d884e87 Compare May 15, 2018 05:17

dotnet-maestro-bot force-pushed the master-UpdateDependencies branch from d884e87 to 998f2fe Compare May 15, 2018 06:02

dotnet-maestro-bot force-pushed the master-UpdateDependencies branch from 998f2fe to 0dda5bc Compare May 15, 2018 13:55

Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNT…

11f19e9

…fsTestILC to preview1-02815-01, preview1-26515-05, preview1-26515-04, preview1-26515-01, beta-26515-00, beta-26515-00, respectively

dotnet-maestro-bot force-pushed the master-UpdateDependencies branch from 0dda5bc to 11f19e9 Compare May 15, 2018 15:39

maryamariyan self-assigned this May 15, 2018

jkotas reviewed May 15, 2018

View reviewed changes

stephentoub reviewed May 15, 2018

View reviewed changes

maryamariyan force-pushed the master-UpdateDependencies branch 2 times, most recently from da427b0 to 49e9114 Compare May 16, 2018 00:56

jkotas reviewed May 16, 2018

View reviewed changes

maryamariyan force-pushed the master-UpdateDependencies branch 2 times, most recently from 421b89e to 872137e Compare May 16, 2018 14:50

maryamariyan force-pushed the master-UpdateDependencies branch from 872137e to 3a53497 Compare May 16, 2018 18:22

Moving ConcurrentQueue to shared

f56918a

Fixes: dotnet/coreclr#17751

maryamariyan force-pushed the master-UpdateDependencies branch from 3a53497 to f56918a Compare May 16, 2018 21:31

karelz added the area-Infrastructure-libraries label May 17, 2018

jkotas closed this May 17, 2018

karelz added this to the 3.0 milestone Jun 2, 2018

Conversation

dotnet-maestro-bot commented May 15, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

jkotas commented May 15, 2018

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

maryamariyan commented May 15, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

maryamariyan commented May 15, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dotnet-maestro-bot commented May 15, 2018

Uh oh!

dotnet-maestro-bot commented May 16, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dotnet-maestro-bot commented May 16, 2018

Uh oh!

dotnet-maestro-bot commented May 16, 2018

Uh oh!

maryamariyan commented May 16, 2018

Uh oh!

dotnet-maestro-bot commented May 17, 2018

Uh oh!

dotnet-maestro-bot commented May 17, 2018

Uh oh!

dotnet-maestro-bot commented May 17, 2018

Uh oh!

jkotas commented May 17, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dotnet-maestro-bot commented May 15, 2018 •

edited

Loading