Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop harvesting old frameworks in some libraries #51689

Merged
merged 3 commits into from
Apr 23, 2021
Merged

Stop harvesting old frameworks in some libraries #51689

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e5872f
Stop harvesting old frameworks in some libraries
ViktorHofer Apr 21, 2021
95b63aa
Revert System.Security.AccessControl changes
ViktorHofer Apr 22, 2021
f460a19
S.Reflection.Context packageIndex updates
ViktorHofer Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
<SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="ref/netstandard1.3">
<SupportedFramework>netcore50</SupportedFramework>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
13 changes: 2 additions & 11 deletions ...braries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,8 @@
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.IO.FileSystem.AccessControl.csproj" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="ref/netstandard1.3">
<SupportedFramework>netcore50</SupportedFramework>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />

<!--
Suppress NETStandard.Library collpasing as it add more dependencies then needed in some
scenarios like .NET Framework which adds an unecessary amount of package dependencies to download
-->
<SuppressMetaPackage Include="NETStandard.Library" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
4 changes: 3 additions & 1 deletion src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.IO.Pipelines.csproj" />
<HarvestIncludePaths Include="lib/netstandard1.3" />

<!-- Even though this library is inbox we want to treat it as out
of box in the package so that we can continue to evolve it. -->
<ValidatePackageSuppression Include="TreatAsOutOfBox">
<Value>.NETCoreApp</Value>
</ValidatePackageSuppression>

<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
12 changes: 2 additions & 10 deletions src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.Http.WinHttpHandler.csproj">
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Net.Http.WinHttpHandler.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<HarvestIncludePaths Include="lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
</ItemGroup>
<PropertyGroup>
<!-- Excluding the reference assets on the package so that RAR will see the run-time conflicts at build time in order to
generate the right binding redirects when targeting Desktop. https://github.com/dotnet/runtime/issues/27470 -->
<ExcludeReferenceAssets>true</ExcludeReferenceAssets>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
6 changes: 4 additions & 2 deletions src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
<ValidatePackageSuppression Include="TreatAsOutOfBox">
<Value>UAP</Value>
</ValidatePackageSuppression>

<HarvestIncludePaths Include="ref/netcore50;lib/netcore50;ref/portable-net45+win8;lib/portable-net45+win8" />
</ItemGroup>
<!-- TODO: Re-enable support check after the 6.0 version of the package is released. -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate? What was going wrong here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were the errors that I wasn't sure how to deal with them:

Errors
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETCore,Version=v4.5 should support System.Reflection.Context inbox but contained a reference assemblies: ref/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="netcore45" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETCore,Version=v4.5 should support System.Reflection.Context inbox but contained a implementation assemblies: lib/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="netcore45" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETCore,Version=v4.5.1 should support System.Reflection.Context inbox but contained a reference assemblies: ref/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="netcore451" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETCore,Version=v4.5.1 should support System.Reflection.Context inbox but contained a implementation assemblies: lib/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="netcore451" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETPortable,Version=v4.6,Profile=Profile44 should support System.Reflection.Context inbox but contained a reference assemblies: ref/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="portable46-net451+win81" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETPortable,Version=v4.6,Profile=Profile44 should support System.Reflection.Context inbox but contained a implementation assemblies: lib/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="portable46-net451+win81" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETPortable,Version=v4.5,Profile=Profile7 should support System.Reflection.Context inbox but contained a reference assemblies: ref/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="portable45-net45+win8" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework .NETPortable,Version=v4.5,Profile=Profile7 should support System.Reflection.Context inbox but contained a implementation assemblies: lib/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="portable45-net45+win8" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework Windows,Version=v8.0 should support System.Reflection.Context inbox but contained a reference assemblies: ref/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="win8" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
    C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): Framework Windows,Version=v8.0 should support System.Reflection.Context inbox but contained a implementation assemblies: lib/netstandard1.1/System.Reflection.Context.dll.  You may need to add <InboxOnTargetFramework Include="win8" /> to your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]

I made sure that the generated nupkg has the expected state, that's why I disabled the support check.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because S.R.C is marked as inbox in the package index. The inbox validation doesn't understand that you can decide to not represent an assembly that's inbox (here it would just get a placeholder).

I think you can make this go away by adding <InboxOnTargetFramework Include="portable-net45+win8" /> It looks like that Harvesting was only harvesting the placeholder files.

Copy link
Member Author

@ViktorHofer ViktorHofer Apr 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't get this working. After adding the InboxOnTargetFramework items for both portables and win8, I now get the following errors:

C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-x86 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-x86-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-x64 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-x64-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-arm but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on .NETCore,Version=v5.0/win10-arm-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="netcore50" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-x86 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-x86-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-x64 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-x64-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-arm but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0/win10-arm-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-x86 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-x86-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-x64 but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-x64-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-arm but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]
C:\Users\vihofer\.nuget\packages\microsoft.dotnet.build.tasks.packaging\6.0.0-beta.21221.6\build\Packaging.targets(1119,5): error : System.Reflection.Context should be supported on UAP,Version=v10.0.16299/win10-arm-aot but has a compile placeholder.  You may need to remove InboxOnTargetFramework Include="uap10.0.16299" /> from your project. [C:\git\runtime2\src\libraries\System.Reflection.Context\pkg\System.Reflection.Context.pkgproj]

If there isn't an easy solution to it I'd be fine to keep the support check for this package disabled.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, because those are OOB frameworks, so the package has to provide an asset. One solution would be to remove the inbox entries from the index just for this package. That would avoid the original issue you mentioned.

runtime/src/libraries/pkg/baseline/packageIndex.json

Lines 4908 to 4913 in 1cc11b1

"InboxOn": {
"net45": "4.0.0.0",
"portable46-net451+win81": "4.0.0.0",
"portable45-net45+win8": "4.0.0.0",
"uap10.0.16299": "4.0.3.0",
"win8": "4.0.0.0"

Remove the portable entries and win8 (effectively "lying" about what's in those targeting packs). Alternatively you could plumb a suppression that told validation to not check for support for some frameworks (take the existing hook you added and consider using it in more places) and consume that near here: https://github.com/dotnet/arcade/blob/e7ede87875f41a9b3df898ae08da5ebc96e24f56/src/Microsoft.DotNet.Build.Tasks.Packaging/src/ValidatePackage.cs#L585

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for the suggestion Eric. I decided to trim the packageIndex graph as I wouldn't want to spend much on a solution for obsolete frameworks. Either the deprecation of the packageIndex or the removal of old netstandard1.x assets will happen at some point which will hopefully make the consideration of these old framework unnecessary.

<PropertyGroup>
<SkipSupportCheck>true</SkipSupportCheck>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
6 changes: 2 additions & 4 deletions ...stem.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.ServiceProcess.ServiceController.csproj" />
<HarvestIncludePaths Include="ref/netstandard1.4">
<SupportedFramework>netcore50</SupportedFramework>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netstandard1.5;lib/netstandard1.4" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
11 changes: 2 additions & 9 deletions src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Text.Encodings.Web.csproj">
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Text.Encodings.Web.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<HarvestIncludePaths Include="lib/netstandard1.0" />
<!-- Since UAP and .NETCoreApp are package based we still want to enable
OOBing libraries that happen to overlap with their framework package.
This avoids us having to lock the API in our NuGet packages just
Expand All @@ -16,11 +12,8 @@
<ValidatePackageSuppression Include="TreatAsOutOfBox">
<Value>.NETCoreApp;UAP</Value>
</ValidatePackageSuppression>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
</ItemGroup>
<PropertyGroup>
<!-- Excluding the reference assets on the package so that RAR will see the run-time conflicts at build time in order to
generate the right binding redirects when targeting Desktop. https://github.com/dotnet/runtime/issues/27470 -->
<ExcludeReferenceAssets>true</ExcludeReferenceAssets>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
7 changes: 2 additions & 5 deletions src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
<SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Threading.AccessControl.csproj" />
<HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
<HarvestIncludePaths Include="ref/netstandard1.3">
<SupportedFramework>netcore50</SupportedFramework>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;net46;netcore50;uap10.0" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>