diff options
| author | Eric St. John <ericstj@microsoft.com> | 2016-03-14 19:51:07 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2016-03-15 23:57:06 +0300 |
| commit | d37bcde44ffb3425ce1046409708e1782d21b30d (patch) | |
| tree | f75dc90ce20c5978d82c35f645f5fe2dcaa5d50d /src/System.Runtime.Extensions/pkg | |
| parent | 6ad2e34491d3cd3a078c225f98b2c49268db81e1 (diff) | |
Use netcore50 shared-lib binaries instead of live
UWP uses shared library which must have exact-match binaries to what
shipped at RTM. Previously we had "special versioned packages" that
folks had to know to use when targeting UWP. This was busted and
fragile so we decided to fix UWP at netstandard1.4 and redistribute the
RTM binaries within the package.
This change adds those UWP RTM binaries to the packages, reassigns any
contracts with new API to a higher netstandard version, and deletes all
the old "special packages".
This change also fixes up other contracts which were previously
providing a netcore50 implementation via netstandard1.5.
Diffstat (limited to 'src/System.Runtime.Extensions/pkg')
| -rw-r--r-- | src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj | 7 | ||||
| -rw-r--r-- | src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj index 8f9533423c..9a87b898f3 100644 --- a/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj +++ b/src/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj @@ -5,11 +5,14 @@ <ProjectReference Include="..\ref\4.0.0\System.Runtime.Extensions.depproj"> <SupportedFramework>net45;netcore45;wp80;wpa81</SupportedFramework> </ProjectReference> + <ProjectReference Include="..\ref\4.0.10\System.Runtime.Extensions.depproj"> + <SupportedFramework>net46;netcore50</SupportedFramework> + </ProjectReference> <ProjectReference Include="..\ref\System.Runtime.Extensions.csproj"> - <SupportedFramework>netcore50;netstandardapp1.5;net46;</SupportedFramework> + <SupportedFramework>netstandardapp1.5;net462</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Extensions.csproj"> - <TargetGroup>net46</TargetGroup> + <TargetGroup>net462</TargetGroup> </ProjectReference> <ProjectReference Include="win\System.Runtime.Extensions.pkgproj" /> <ProjectReference Include="unix\System.Runtime.Extensions.pkgproj" /> diff --git a/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj b/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj index cec3059c74..569df548dc 100644 --- a/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj +++ b/src/System.Runtime.Extensions/pkg/win/System.Runtime.Extensions.pkgproj @@ -11,7 +11,11 @@ <ProjectReference Include="..\..\src\System.Runtime.Extensions.csproj"> <OSGroup>Windows_NT</OSGroup> </ProjectReference> - <ProjectReference Include="..\..\src\System.Runtime.Extensions.csproj"> + <ProjectReference Include="..\..\src\redist\System.Runtime.Extensions.depproj"> + <OSGroup>Windows_NT</OSGroup> + <TargetGroup>netcore50</TargetGroup> + </ProjectReference> + <ProjectReference Include="..\..\src\redist\System.Runtime.Extensions.depproj"> <OSGroup>Windows_NT</OSGroup> <TargetGroup>netcore50aot</TargetGroup> </ProjectReference> |