Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest System.Memory for ns2.0 refs #2112

Merged
merged 1 commit into from
Jan 27, 2020

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Jan 23, 2020

Looks like this regressed here https://github.com/dotnet/corefx/pull/41270/files#r370406355 (likely bad merge resolution).

@ghost
Copy link

ghost commented Jan 24, 2020

Hello @ericstj!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@@ -29,7 +29,7 @@
<!-- This is to make sure that nothing unintended gets restored for netcoreapp. -->
<ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'">
<!-- runtime dependency: System.Diagnostics.PerformanceCounters netcoreapp2.0,net461 -->
<PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
<PackageReference Include="System.Memory" Version="4.5.3" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If (or when) a newer version of S.M ships, would we have to update this to that latest version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s a decision we’d make at the time depending on what the bar was.

@safern
Copy link
Member

safern commented Jan 25, 2020

The failure you're hitting in the tests is already fixed: #2165

Retry won't fix because of the checkout bundle, but if you re-run you shouldn't see it, so up to you.

@ericstj ericstj merged commit bcd203d into dotnet:master Jan 27, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 11, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants