diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-09-19 15:19:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 15:19:22 +0300 |
| commit | efd29b5cf854679349066e22ef9038b8cfe76d94 (patch) | |
| tree | 2de750c1ac8a487d7f6d149592a6362ade6a5a77 /src/System.Private.Interop/src/System.Private.Interop.csproj | |
| parent | f9124d69e41d42196510dd7234b2d53fed48ad4c (diff) | |
| parent | 49f9ed0e66fc2d4cd682821396c6af5e80182048 (diff) | |
Merge pull request #25 from ntherning/bump-corert
Bump to latest upstream
Diffstat (limited to 'src/System.Private.Interop/src/System.Private.Interop.csproj')
| -rw-r--r-- | src/System.Private.Interop/src/System.Private.Interop.csproj | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/System.Private.Interop/src/System.Private.Interop.csproj b/src/System.Private.Interop/src/System.Private.Interop.csproj index 73411b210..f3561abda 100644 --- a/src/System.Private.Interop/src/System.Private.Interop.csproj +++ b/src/System.Private.Interop/src/System.Private.Interop.csproj @@ -1,7 +1,7 @@ <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyName>System.Private.Interop</AssemblyName> + <AssemblyName Condition="'$(AssemblyName)' == ''">System.Private.Interop</AssemblyName> <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);TARGET_CORE_API_SET</DefineConstants> @@ -21,7 +21,8 @@ <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> </ProjectReference> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> - <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.csproj" /> + <ProjectReference Condition="'$(DynamicCodeSupport)' != 'true'" Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.csproj" /> + <ProjectReference Condition="'$(DynamicCodeSupport)' == 'true'" Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.Experimental.csproj" /> </ItemGroup> <Import Project="System.Private.Interop.Shared.projitems" /> |