Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Replace files with CoreLib mirror (<30% differences) #29433

Merged
merged 6 commits into from
May 2, 2018
Merged

Replace files with CoreLib mirror (<30% differences) #29433

merged 6 commits into from
May 2, 2018

Conversation

MarcoRossignoli
Copy link
Member

contributes to #27841

there are other files:

corefx\src\Common\src\CoreLib\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs
corefx\src\Common\src\Interop\Windows\kernel32\Interop.MultiByteToWideChar.cs

corefx\src\Common\src\CoreLib\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs
corefx\src\Common\src\Interop\Windows\kernel32\Interop.SetThreadErrorMode.cs

corefx\src\Common\src\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs
corefx\src\Common\src\Interop\Windows\kernel32\Interop.WideCharToMultiByte.cs

but to replace those we need to move "constants" of CoreLib files somewhere because collide with constants on corefx(es. corefx\src\Common\src\Interop\Windows\kernel32\Interop.Encoding.Constants.cs).
Any idea?

cc: @danmosemsft @jkotas

@jkotas
Copy link
Member

jkotas commented May 1, 2018

move "constants"

Sounds good to me.

If SEM_FAILCRITICALERRORS is only ever used together with SetThreadErrorMode, it would be best for it to live in Interop.SetThreadErrorMode.cs; not in a separate file with some other random constants. Same for other similar cases.

https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/interop-guidelines.md#file-organization

@jkotas
Copy link
Member

jkotas commented May 1, 2018

src\Common\src\CoreLib\System\TupleExtensions.cs(924,220): error CS0122: 'ITuple' is inaccessible due to its protection level

@MarcoRossignoli MarcoRossignoli changed the title Replace files with CoreLib mirror (<30% differences) [WIP]Replace files with CoreLib mirror (<30% differences) May 2, 2018
@MarcoRossignoli MarcoRossignoli changed the title [WIP]Replace files with CoreLib mirror (<30% differences) Replace files with CoreLib mirror (<30% differences) May 2, 2018
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetCPInfoEx.cs">
<Link>Common\Interop\Windows\Interop.GetCPInfoEx.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
Copy link
Member Author

Choose a reason for hiding this comment

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

@jkotas constants are used only here...i removed file on corefx and added reference to corelib. Is this a good compromise to you?(If not i can create a Interop.Encoding.Constants.cs on corecrl, remove from existent cs and after merge on corefx change ref here)

@jkotas jkotas merged commit 5168f54 into dotnet:master May 2, 2018
@jkotas
Copy link
Member

jkotas commented May 2, 2018

@MarcoRossignoli Thank you!

@MarcoRossignoli MarcoRossignoli deleted the filedups branch May 2, 2018 13:55
@karelz karelz added this to the 2.2.0 milestone May 5, 2018
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
…9433)

* remove duplicates

* remove unused Interop.GetFullPathNameW.cs

* revert TupleExtensions.cs for netfx incompatibility

* replace coreclr merged

* replace constants conflicts


Commit migrated from dotnet/corefx@5168f54
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.

5 participants