diff options
| author | Stephen Toub <stoub@microsoft.com> | 2019-02-13 13:43:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 13:43:13 -0500 |
| commit | 78cbd968cabc2bd6c84bfe6a0a240658e564a6d5 (patch) | |
| tree | 17cc1c5224af1cf06b65069a34ea7b175bb2d625 /src/System.Private.CoreLib/System.Private.CoreLib.csproj | |
| parent | b8d7a8de00bd13c958d501ada0695af52f6761af (diff) | |
| download | coreclr-78cbd968cabc2bd6c84bfe6a0a240658e564a6d5.tar.gz coreclr-78cbd968cabc2bd6c84bfe6a0a240658e564a6d5.tar.bz2 coreclr-78cbd968cabc2bd6c84bfe6a0a240658e564a6d5.zip | |
Replace Win32Native.cs with Interop files (#22540)
* Replace Win32Native.cs with Interop files
- Replace Win32Native usage with existing Interop.* calls where they already existed
- Moved Win32Native.* to their own files otherwise, and changed call sites
- Left a stub Win32Native in place to handle some emitted IL from the runtime. The current infrastructure doesn't support targeting nested types, like Interop.Kernel32, and fixing that would be more involved.
* Remove Win32Native.cs
Replace emitted calls with ones to Marshal.
* Fix incorrectly changed field
* Fix Kernel32 -> Ole32
Diffstat (limited to 'src/System.Private.CoreLib/System.Private.CoreLib.csproj')
| -rw-r--r-- | src/System.Private.CoreLib/System.Private.CoreLib.csproj | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj index e785601d35..df251e5a71 100644 --- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -118,7 +118,6 @@ <Compile Include="$(BclSourcesRoot)\Internal\Console.cs" /> <Compile Include="$(BclSourcesRoot)\Internal\Runtime\Augments\RuntimeThread.cs" /> <Compile Include="$(BclSourcesRoot)\Microsoft\Win32\UnsafeNativeMethods.cs" /> - <Compile Include="$(BclSourcesRoot)\Microsoft\Win32\Win32Native.cs" /> <Compile Include="$(BclSourcesRoot)\System\__Canon.cs" /> <Compile Include="$(BclSourcesRoot)\System\Activator.cs" /> <Compile Include="$(BclSourcesRoot)\System\AppContext.CoreCLR.cs" /> @@ -276,6 +275,15 @@ <Compile Include="$(BclSourcesRoot)\System\ValueType.cs" /> <Compile Include="$(BclSourcesRoot)\System\WeakReference.cs" /> <Compile Include="$(BclSourcesRoot)\System\WeakReferenceOfT.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.GetStdHandle.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.LocalAlloc.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.QueryUnbiasedInterruptTime.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.VerifyVersionExW.cs" /> + <Compile Include="shared\Interop\Windows\Kernel32\Interop.VerSetConditionMask.cs" /> + <Compile Include="shared\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs" /> + <Compile Include="shared\Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs" /> </ItemGroup> <ItemGroup> <Compile Include="$(BclSourcesRoot)\System\Diagnostics\Eventing\XplatEventLogger.cs" Condition="'$(FeatureXplatEventSource)' == 'true'" /> |