diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-13 20:04:15 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-13 20:04:15 +0300 |
| commit | e56a0253a30d5cf44f8457b469c3ecc3345ca957 (patch) | |
| tree | 27bd5a2d0c00d4cc99514b316a0f0a7c1416ec80 /src/System.Reflection.Primitives | |
| parent | a647c3b2aa49638c7ceaa0a1eca23b8e93022067 (diff) | |
| parent | 34b39833b1512ea681199d5d83d9519b6a422726 (diff) | |
Merge branch master into dev/eng
Diffstat (limited to 'src/System.Reflection.Primitives')
3 files changed, 5 insertions, 1 deletions
diff --git a/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj b/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj index 6fbcf7989a..d39013c645 100644 --- a/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj +++ b/src/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj @@ -7,6 +7,9 @@ </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\src\System.Reflection.Primitives.csproj" /> + <ProjectReference Include="..\..\src\System.Reflection.Primitives.csproj" > + <TargetGroup>netcoreapp1.2corert</TargetGroup> + </ProjectReference> <InboxOnTargetFramework Include="MonoAndroid10" /> <InboxOnTargetFramework Include="MonoTouch10" /> <InboxOnTargetFramework Include="net45" /> diff --git a/src/System.Reflection.Primitives/src/Configurations.props b/src/System.Reflection.Primitives/src/Configurations.props index ed0bd2acc9..d67a9b81d8 100644 --- a/src/System.Reflection.Primitives/src/Configurations.props +++ b/src/System.Reflection.Primitives/src/Configurations.props @@ -5,6 +5,7 @@ net463-Windows_NT; uap101aot-Windows_NT; netstandard; + netcoreapp1.2corert; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index c5992cb6db..1361c5c2af 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -11,7 +11,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)'=='uap101aot'"> + <ItemGroup Condition="'$(TargetGroup)'=='uap101aot' or '$(TargetGroup)'=='netcoreapp1.2corert'"> <Compile Include="System\Reflection\Emit\FlowControl.cs" /> <Compile Include="System\Reflection\Emit\Opcode.cs" /> <Compile Include="System\Reflection\Emit\OpCodes.cs" /> |