Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[master] Update dependencies from dotnet/coreclr#38099

Merged
wtgodbe merged 3 commits intomasterfrom
darc-master-2c0fb678-eba1-431a-ae32-f4f74d47c213
May 31, 2019
Merged

[master] Update dependencies from dotnet/coreclr#38099
wtgodbe merged 3 commits intomasterfrom
darc-master-2c0fb678-eba1-431a-ae32-f4f74d47c213

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

This pull request updates the following dependencies

From https://github.com/dotnet/coreclr

  • Build: 20190530.2
  • Date Produced: 5/30/2019 10:50 PM
  • Commit: fa8383f
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.NET.Sdk.IL -> 3.0.0-preview6.19280.2
    • Microsoft.NETCore.ILAsm -> 3.0.0-preview6.19280.2
    • Microsoft.NETCore.Runtime.CoreCLR -> 3.0.0-preview6.19280.2

…0530.2

- Microsoft.NET.Sdk.IL - 3.0.0-preview6.19280.2
- Microsoft.NETCore.ILAsm - 3.0.0-preview6.19280.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6.19280.2
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented May 31, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • All Checks Successful Unsuccessful checks: corefx-ci

@stephentoub stephentoub reopened this May 31, 2019
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

Microsoft.DotNet.ApiCompat.targets(143,5): error : MembersMustExist : Member 'System.Environment.TickCount64.get()' does not exist in the reference but it does exist in the implementation.

Due to dotnet/coreclr#24857. I'll fixup the baseline file. CC @stephentoub @jkotas @ericstj

@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

Now the service index for myget is down... great timing. If we can't get this in by noon, it should be covered by dependency flow while we're becoming coherent, so it's not the end of the world.

@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@stephentoub
Copy link
Copy Markdown
Member

I'll fixup the baseline file.

The fix should be #38063, you can cherry-pick it to verify.

@wtgodbe wtgodbe force-pushed the darc-master-2c0fb678-eba1-431a-ae32-f4f74d47c213 branch from 8de3466 to 0f23b62 Compare May 31, 2019 17:45
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

@stephentoub done

@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

@stephentoub failing on NETFX:

[error]System\Net\Http\WinInetProxyHelper.cs(76,25): error CS0117: 'Environment' does not contain a definition for 'TickCount64'

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

Given that the first half of the change is already in CoreClr, we need to decide on a fix for this now otherwise it will block dependency flow while we're becoming coherent. Either back the change out of CoreClr, fix the above error, or modify the APICompat baseline as a stopgap. @stephentoub do you have a strong preference?

@stephentoub
Copy link
Copy Markdown
Member

Either back the change out of CoreClr, fix the above error, or modify the APICompat baseline as a stopgap.

Let's just fix the above error. Just revert that one file.

@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe wtgodbe closed this May 31, 2019
@wtgodbe wtgodbe reopened this May 31, 2019
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

This PR has been closed and reopened 12 times, must be some kind of record 🤣

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

CC @alexperovich @ChadNedzlek @MattGal this is the second time today I've seen a PR that finished test execution in Helix, but the AzDO job never get an indication from Helix that it was done. I remember seeing a similar issue a while back, but I hadn't noticed it again until today. Is this a known thing?

Same thing happened here: #36884

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 31, 2019

CI failures are unrelated

@wtgodbe wtgodbe merged commit 06f25ea into master May 31, 2019
wtgodbe pushed a commit to dotnet-maestro-bot/corefx that referenced this pull request May 31, 2019
* Update dependencies from https://github.com/dotnet/coreclr build 20190530.2

- Microsoft.NET.Sdk.IL - 3.0.0-preview6.19280.2
- Microsoft.NETCore.ILAsm - 3.0.0-preview6.19280.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6.19280.2

* Expose, test, and use Environment.TickCount64

* Back out change to WinInetProxyHelper.cs
@stephentoub stephentoub deleted the darc-master-2c0fb678-eba1-431a-ae32-f4f74d47c213 branch June 12, 2019 19:54
@karelz karelz added this to the 3.0 milestone Jul 16, 2019
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Update dependencies from https://github.com/dotnet/coreclr build 20190530.2

- Microsoft.NET.Sdk.IL - 3.0.0-preview6.19280.2
- Microsoft.NETCore.ILAsm - 3.0.0-preview6.19280.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview6.19280.2

* Expose, test, and use Environment.TickCount64

* Back out change to WinInetProxyHelper.cs


Commit migrated from dotnet/corefx@06f25ea
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants