forked from dotnet/runtime
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove packages from NETStandard.Library 1.6
With three exceptions:
- System.Runtime.InteropServices.RuntimeInformation.
- Types don't yet exist on desktop, needs out-of-band ref & impl
- System.Net.Http
- Members don't yet exist on desktop, needs out-of-band ref & impl
- System.IO.Compression
- Bugfixes over desktop, needs out-of-band impl
For the rest we will no longer ship packages.
Instead the types will be supported as follows:
1. In a netstandard2.0+ project via NETStandard.Library package's
netstandard.dll
2. In a netstandard1.x project via NETStandard.Library package and
closure which ship from servicing branches.
3. In a framework specific project via the framework's targeting pack
or framework package.
Commit migrated from dotnet/corefx@0797813- Loading branch information
Showing
5 changed files
with
98 additions
and
0 deletions.
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
src/libraries/System.IO.Compression/pkg/System.IO.Compression.builds
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||
| <ItemGroup> | ||
| <Project Include="System.IO.Compression.pkgproj" /> | ||
| </ItemGroup> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> | ||
| </Project> |
35 changes: 35 additions & 0 deletions
35
src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\ref\System.IO.Compression.csproj"> | ||
| <SupportedFramework>netcoreapp2.0;net463;$(AllXamarinFrameworks)</SupportedFramework> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\src\System.IO.Compression.builds" /> | ||
| <InboxOnTargetFramework Include="net45"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="win8" /> | ||
| <InboxOnTargetFramework Include="wpa81" /> | ||
| <InboxOnTargetFramework Include="portable-net45+win8+wpa81" /> | ||
| <InboxOnTargetFramework Include="MonoAndroid10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="MonoTouch10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarinios10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarinmac20"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarintvos10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarinwatchos10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| </ItemGroup> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> | ||
| </Project> |
1 change: 1 addition & 0 deletions
1
src/libraries/System.IO.Compression/pkg/ValidationSuppression.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| PermitHigherCompatibleImplementationVersion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||
| <ItemGroup> | ||
| <Project Include="System.Net.Http.pkgproj" /> | ||
| </ItemGroup> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\ref\System.Net.Http.csproj"> | ||
| <SupportedFramework>netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\ref\System.Net.Http.csproj"> | ||
| <TargetGroup>net46</TargetGroup> | ||
| <SupportedFramework>net46</SupportedFramework> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\src\System.Net.Http.builds" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <InboxOnTargetFramework Include="monoandroid10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="monotouch10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="net45"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="win8" /> | ||
| <InboxOnTargetFramework Include="wpa81" /> | ||
| <InboxOnTargetFramework Include="portable-net45+win8+wpa81" /> | ||
| <InboxOnTargetFramework Include="xamarinios10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="Xamarinmac20"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarintvos10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <InboxOnTargetFramework Include="xamarinwatchos10"> | ||
| <AsFrameworkReference>true</AsFrameworkReference> | ||
| </InboxOnTargetFramework> | ||
| <ValidatePackageSuppression Include="SuppressNETStandardInference"> | ||
| <!-- we support the netstandard2.0 API version on net46, but suppress inferring netstandard support based on desktop support --> | ||
| <Value>.NETFramework,Version=v4.6;.NETFramework,Version=v4.6.1;.NETFramework,Version=v4.6.2</Value> | ||
| </ValidatePackageSuppression> | ||
| <!-- TODO: Bring in Microsoft.Net.Http on older platforms --> | ||
| </ItemGroup> | ||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> | ||
| </Project> |