diff options
author | Eric St. John <ericstj@microsoft.com> | 2016-05-17 02:00:40 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2016-05-17 02:00:40 +0300 |
commit | 68ba16ea43a1ab105c3957bd26cec456fef80989 (patch) | |
tree | f575040193f1df629397ecf1a41bf4b8b4f666c1 /src/System.ComponentModel.TypeConverter/pkg | |
parent | d1d2319f17753215e3c1d9b0db0c81485c3971b9 (diff) |
Fix ComponentModel.TypeConverter build
There were two issues with this commit: https://github.com/dotnet/corefx/commit/84152d3b83a01b422bc24339e25ee7d0a28ec093
1. ComponentModel.TypeConverter netstandard1.0 build was running API
compat against the 4.1.0.0 contract rather than the 4.0.0.0 contract.
2. Supported frameworks in the package were incorrect.
[tfs-changeset: 1605166]
Diffstat (limited to 'src/System.ComponentModel.TypeConverter/pkg')
-rw-r--r-- | src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj index 6e12dc4d79..779e648302 100644 --- a/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj +++ b/src/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj @@ -3,10 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\4.0\System.ComponentModel.TypeConverter.depproj"> - <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework> + <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework> </ProjectReference> <ProjectReference Include="..\ref\System.ComponentModel.TypeConverter.csproj"> - <SupportedFramework>net462;netstandardapp1.5</SupportedFramework> + <SupportedFramework>net462;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.TypeConverter.builds" /> </ItemGroup> |