Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fix crashing on startup (#1596) #1604

Merged
merged 2 commits into from
Jul 29, 2016
Merged

Fix crashing on startup (#1596) #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
678522f
Add CORERT define to System.Private.Interop.csproj
Jul 29, 2016
c518b27
Put currently broken code under #if !CORERT
Jul 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/System.Private.Interop/src/Shared/ComCallableObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,8 @@ unsafe internal class ComCallableObject

static internal void InitRefCountedHandleCallback()
{
// TODO: <https://github.com/dotnet/corert/issues/1596>
#if !CORERT
//
// Register the callback to ref-counted handles
// Inside this callback we'll determine whether the ref count handle to the target object
Expand All @@ -1084,6 +1086,7 @@ static internal void InitRefCountedHandleCallback()
AddrOfIntrinsics.AddrOf<AddrOfIntrinsics.AddrOfIsAlive>(ComCallableObject.IsAlive),
typeof(ComCallableObject).TypeHandle
);
#endif
}

/// <summary>
Expand Down
3 changes: 3 additions & 0 deletions src/System.Private.Interop/src/System.Private.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);TARGET_CORE_API_SET</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(IsProjectNLibrary)' != 'true'">
<DefineConstants>CORERT;$(DefineConstants)</DefineConstants>
</PropertyGroup>

<!-- Default configurations to help VS understand the options -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
Expand Down