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

enable build System.Private.Interop project #4836

Merged
luqunl merged 2 commits into from
Oct 31, 2017
Merged

enable build System.Private.Interop project #4836

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
3679a5e
Enable build System.Private.Interop.mono project
luqunl Oct 31, 2017
4fc5070
Use low case interop
luqunl Oct 31, 2017
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
2 changes: 1 addition & 1 deletion src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<OnlyBuildProjectNLibraries>false</OnlyBuildProjectNLibraries>
<TargetsWindows Condition="$(TargetsWindows) ==''">true</TargetsWindows>
<TargetNetCoreForCoreCLRFramework>true</TargetNetCoreForCoreCLRFramework>
<OutputPath>$(OutputPath)\coreclr</OutputPath>
<OutputPath>$(BaseOutputPath)$(OSPlatformConfig)\interop\coreclr</OutputPath>
<TargetFramework>netstandard1.3</TargetFramework>
<IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
</PropertyGroup>
Expand Down
82 changes: 75 additions & 7 deletions src/System.Private.Interop/src/System.Private.Interop.Mono.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="System.Private.Interop.CoreCLR.csproj" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<AssemblyName>System.Private.Interop</AssemblyName>
<TargetName>$(AssemblyName)</TargetName>
<OutputType>Library</OutputType>
<OutputPath>$(BaseOutputPath)$(OSPlatformConfig)\interop\mono</OutputPath>
<ProjectGuid>{A85709C9-22D5-4704-8B7A-73751BB4386A}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>TARGET_CORE_API_SET;CORECLR;</DefineConstants>
<!-- Disable warning about CLSCompliant attributes on members not being needed. -->
<NoWarn>$(NoWarn);3021</NoWarn>
<!-- Use MSFT assembly key for compatibility with uapaot targeting pack -->
<AssemblyKey>MSFT</AssemblyKey>
<OnlyBuildProjectNLibraries>false</OnlyBuildProjectNLibraries>
<TargetsWindows Condition="$(TargetsWindows) ==''">true</TargetsWindows>
<TargetNetCoreForCoreCLRFramework>true</TargetNetCoreForCoreCLRFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
<DefineConstants>$(DefineConstants);ENABLE_MIN_WINRT</DefineConstants>
<OutputPath>$(OutputPath)\mono</OutputPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Diagnostics.Contracts">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.TypeExtensions">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Private.CompilerServices.ICastable">
<Version>1.0.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Compile Include="InteropExtensions\DependencyReductionConditionallyDependentAttribute.cs" />
<Compile Include="InteropExtensions\DependencyReductionRootAttribute.cs" />
<Compile Include="InteropExtensions\DependencyReductionTypeRemoved.cs" />
<Compile Include="InteropExtensions\EagerStaticClassConstructionAttribute.cs" />
<Compile Include="InteropExtensions\ExplicitScopeAttribute.cs" />
<Compile Include="InteropExtensions\FixupRuntimeTypeHandle.cs" />
<Compile Include="InteropExtensions\IActivationFactory.cs" />
<Compile Include="InteropExtensions\InternalExtensions.cs" />
<Compile Include="InteropExtensions\InteropExtensions.cs" />
<Compile Include="InteropExtensions\Lock.cs" />
<Compile Include="InteropExtensions\MetadataTransformedAttribute.cs" />
<Compile Include="InteropExtensions\MissingInteropDataException.cs" />
<Compile Include="InteropExtensions\MissingMetadataException.cs" />
<Compile Include="InteropExtensions\NativeCallableAttribute.cs" />
<Compile Include="InteropExtensions\PreInitializedAttribute.cs" />
<Compile Include="InteropExtensions\PInvokeMarshal.cs" />
<Compile Include="Interop\Interop.PlatformNotSupported.cs" />
<Compile Include="..\..\Common\src\System\Runtime\InteropServices\McgPInvokeData.cs">
<Link>System\Runtime\InteropServices\McgPInvokeData.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\System\Runtime\InteropServices\McgGeneratedNativeCallCodeAttribute.cs">
<Link>System\Runtime\InteropServices\McgGeneratedNativeCallCodeAttribute.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="Interop\Interop.WinRT.cs" />
<Compile Include="Interop\Interop.WinRT.Basic.cs" />
<Compile Include="System\Runtime\InteropServices\Variant.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="InteropExtensions\DebugAnnotations.cs" />
<Compile Include="System\Reflection\DispatchProxy.cs" />
<Compile Include="System\Reflection\DispatchProxyEntry.cs" />
<Compile Include="System\Reflection\DispatchProxyHelpers.cs" />
<Compile Include="System\Reflection\DispatchProxyInstanceNotFoundException.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="InteropExtensions\DebugAnnotations.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\__IUnboxInternal.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\CLRIKeyValuePairImpl.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\IPropertyValue.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\IReadOnlyListAdapter.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\IReferenceArray.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\PropertyType.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\PropertyValueImpl.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\ReferenceArrayImpl.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\ReferenceArrayImplBase.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\ReferenceImpl.cs" />
<Compile Include="System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs" />

</ItemGroup>

<ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="Windows\Foundation\Collections\IKeyValuePair.cs" />
<Compile Include="Windows\Foundation\IReference.cs" />
<Compile Include="Windows\Foundation\Point.cs" />
<Compile Include="Windows\Foundation\PropertyType.cs" />
<Compile Include="Windows\Foundation\Rect.cs" />
<Compile Include="Windows\Foundation\Size.cs" />
<Compile Include="Windows\Foundation\TokenizerHelper.cs" />
</ItemGroup>


<Import Project="System.Private.Interop.Shared.projitems" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
4 changes: 0 additions & 4 deletions src/dirs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<ExcludeProjects Include="**\ILVerify.csproj" />
<ExcludeProjects Include="**\ILVerify.Tests.csproj" />

<!-- These projects have issues building in CoreRT -->
<ExcludeProjects Condition="'$(IsProjectNLibrary)' != 'true'" Include="**\System.Private.Interop.CoreCLR.csproj" />
<ExcludeProjects Condition="'$(IsProjectNLibrary)' != 'true'" Include="**\System.Private.Interop.Mono.csproj" />

<Project Include="AotPackageReference\AotPackageReference.depproj" />

<Project Include="Framework\Framework.depproj" />
Expand Down