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

Trivial update WindowsRuntimeResourceManager#30289

Closed
luqunl wants to merge 3 commits into
dotnet:masterfrom
luqunl:WindowsRuntimeResourceManagerBase
Closed

Trivial update WindowsRuntimeResourceManager#30289
luqunl wants to merge 3 commits into
dotnet:masterfrom
luqunl:WindowsRuntimeResourceManagerBase

Conversation

@luqunl
Copy link
Copy Markdown
Contributor

@luqunl luqunl commented Jun 11, 2018

Update PRIExceptionInfo field's name caused by dotnet/coreclr#18417

@luqunl luqunl requested a review from tarekgh June 11, 2018 20:28
@tarekgh tarekgh added the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Jun 11, 2018
@tarekgh
Copy link
Copy Markdown
Member

tarekgh commented Jun 11, 2018

@luqunl I marked this issue as no-merge till we get the update from coreclr

@luqunl luqunl removed the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Jun 13, 2018
luqunl and others added 2 commits June 13, 2018 11:22
Trivial Update WindowsRuntimeResourceManager
6d4f840
@dotnet-maestro-bot
Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC, S…
65c1db5 
…tandard to preview1-26613-04, preview1-26613-07, preview1-26613-01, beta-26613-00, beta-26613-00, servicing-26419-02, respectively
@luqunl luqunl force-pushed the WindowsRuntimeResourceManagerBase branch from a987c0b to 65c1db5 Compare June 13, 2018 18:25
@luqunl
Copy link
Copy Markdown
Contributor Author

luqunl commented Jun 13, 2018

The change "Remove Opcodes due to Opcodes moved to S.P.Corelib" is to solve duplicate OpCode type issue.

11:44:48 System\Reflection\Emit\OpCodes.cs(981,32): error CS0436: The type 'OpCode' in 'D:\j\workspace\windows-TGrou---c60886e1\src\System.Reflection.Primitives\src\System\Reflection\Emit\Opcode.cs' conflicts with the imported type 'OpCode' in 'System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. Using the type defined in 'D:\j\workspace\windows-TGrou---c60886e1\src\System.Reflection.Primitives\src\System\Reflection\Emit\Opcode.cs'. [D:\j\workspace\windows-TGrou---c60886e1\src\System.Reflection.Primitives\src\System.Reflection.Primitives.csproj]

@luqunl
Copy link
Copy Markdown
Contributor Author

luqunl commented Jun 13, 2018 •
edited
Loading

The following testcase failed..

@luqunl luqunl mentioned this pull request Jun 13, 2018
Closed
@jkotas jkotas closed this Jun 23, 2018
@karelz karelz added this to the 3.0 milestone Jul 8, 2018
@luqunl luqunl deleted the WindowsRuntimeResourceManagerBase branch August 15, 2018 23:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@stephentoub stephentoub stephentoub approved these changes

@tarekgh tarekgh tarekgh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@luqunl luqunl

Labels

area-System.Resources

Projects

None yet

Milestone

3.0

Development

Successfully merging this pull request may close these issues.

6 participants

@luqunl @tarekgh @stephentoub @karelz @jkotas @dotnet-maestro-bot