diff options
author | Eric St. John <ericstj@microsoft.com> | 2016-10-31 22:14:00 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2016-11-02 00:26:25 +0300 |
commit | cdaaefc0fb6c0e5d751edf89e30fefff09236bcf (patch) | |
tree | e5e950d8072de910f16c807f5b5e4635379c30a6 /src/System.Runtime.Extensions/ref | |
parent | 2ef3fafdcdf974ec2d61963d527bc205d2be89b3 (diff) |
Make TargetGroup-empty be for netcoreapp
This refactors all builds to make the netcoreapp-latest to be the
default build.
To do this I needed to be specific about the contract project in a few
cases so I made a fix to build tools to permit that and brought over
that fix as part of this commit.
Diffstat (limited to 'src/System.Runtime.Extensions/ref')
-rw-r--r-- | src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds | 2 | ||||
-rw-r--r-- | src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds index debce2464e..9034d82ac3 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds @@ -4,7 +4,7 @@ <ItemGroup> <Project Include="System.Runtime.Extensions.csproj" /> <Project Include="System.Runtime.Extensions.csproj"> - <TargetGroup>netcoreapp1.1</TargetGroup> + <TargetGroup>netstandard1.7</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj index 953d02bc41..788eb103fa 100644 --- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj @@ -3,10 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <OutputType>Library</OutputType> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETCoreApp,Version=v1.1</NuGetTargetMoniker> <!-- copy to uap10.1 until nuget makes the change to map that to ns1.7 --> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> - <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">$(DefineConstants);netcoreapp11</DefineConstants> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard1.7'">netstandard1.7;uap10.1</PackageTargetFramework> + <DefineConstants Condition="'$(TargetGroup)' == ''">$(DefineConstants);netcoreapp11</DefineConstants> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.Extensions.cs" /> |