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

Mirror changes from dotnet/coreclr#25490

Merged
danmoseley merged 2 commits into
masterfrom
mirror-merge-9414713
Nov 25, 2017
Merged

Mirror changes from dotnet/coreclr#25490
danmoseley merged 2 commits into
masterfrom
mirror-merge-9414713

Conversation

@dotnet-bot
Copy link
Copy Markdown

This PR contains mirrored changes from dotnet/coreclr

Please REBASE this PR when merging

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
@stephentoub
Copy link
Copy Markdown
Member

@Anipik, @danmosemsft, the changes made in coreclr are causing failures in the netfx build:

D:\j\workspace\windows-TGrou---2a8f9c29\src\Microsoft.Diagnostics.Tracing.EventSource.Redist\shared\TraceLogging\EventPayload.cs(56,75): error CS0103: The name 'SR' does not exist in the current context [D:\j\workspace\windows-TGrou---2a8f9c29\src\Microsoft.Diagnostics.Tracing.EventSource.Redist\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj]
D:\j\workspace\windows-TGrou---2a8f9c29\src\Microsoft.Diagnostics.Tracing.EventSource.Redist\shared\TraceLogging\EventPayload.cs(56,85): error CS0103: The name 'SR' does not exist in the current context [D:\j\workspace\windows-TGrou---2a8f9c29\src\Microsoft.Diagnostics.Tracing.EventSource.Redist\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj]

@danmoseley
Copy link
Copy Markdown
Member

This is because in CoreCLR, this file is built without ES_BUILD_STANDALONE defined, which puts it in namespace System.Diagnostics.Tracing so it finds System.SR. In CoreFX, it is built with it defined, so it is in the Microsoft namespace.
Pushing using System;...

@danmoseley
Copy link
Copy Markdown
Member

Also the .resx is not shared currently.

@danmoseley
Copy link
Copy Markdown
Member

I'm going to merge as this already went into coreclr

@danmoseley danmoseley merged commit 9a5f587 into master Nov 25, 2017
@danmoseley danmoseley deleted the mirror-merge-9414713 branch November 25, 2017 05:19
@karelz karelz added this to the 2.1.0 milestone Dec 4, 2017
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.

5 participants