diff options
author | Viktor Hofer <viktor.hofer@microsoft.com> | 2021-08-06 13:01:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-06 13:01:36 +0300 |
commit | 22cee85aa08061e5b2c1e893797a860e3c642e6c (patch) | |
tree | b9ff616897363d8612cc8d59cec9a51ab75eb32c /eng/Subsets.props | |
parent | 3602be5ae29b6df849519743ba53c2752ec6d6d6 (diff) |
Clean-up pkgproj leftovers in libs and apply fixes (#56899)
* Clean-up pkgproj leftovers in libs and apply fixes
Remove any pkgproj infrastructure that was only used by src/libraries
(which is the majority). Delete the packageindex *YAY*.
Update the documentation that covered the packageindex and the pkgprojs.
Avoid any incremental builds during packaging by removing
libraries-packages.proj and use src.proj for packaging instead. Make use
of the `GeneratePackageOnBuild` property to build package during the
allconfigurations without requiring a different entry target.
Fix the addition of the DocumentationFile during packaging when
`GeneratePackageOnBuid` is used by hooking onto the
`DocumentationProjectOutputGroup` that NuGet uses and replacing the
generated documentation file with the one that comes via the
intellisense package.
Also introduce a property to choose the generated documentation file
over the one from the intellisense package:
<UseIntellisenseDocumentationFile>false</UseIntellisenseDocumentationFile>
Removing a few leftover PackageDescription properties from the projects'
Directory.Build.props file.
Cleaning up properties in Directory.Build.props & Directory.Build.targets
files.
* Actually run packaging during the allconfigurations build
* Update docs
* make runtime specific pkgs non packable
* io.ports native pkg fixes
Diffstat (limited to 'eng/Subsets.props')
-rw-r--r-- | eng/Subsets.props | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/eng/Subsets.props b/eng/Subsets.props index f26f40c7d7a..47a53c75e7c 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -63,7 +63,7 @@ <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == '' or '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets> - <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.ref+libs.src+libs.packages</DefaultLibrariesSubsets> + <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.ref+libs.src</DefaultLibrariesSubsets> <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets> <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets> @@ -284,10 +284,6 @@ <ProjectToBuild Include="$(LibrariesProjectRoot)pretest.proj" Category="libs" /> </ItemGroup> - <ItemGroup Condition="$(_subset.Contains('+libs.packages+')) and '$(PgoInstrument)' != 'true'"> - <ProjectToBuild Include="$(LibrariesProjectRoot)libraries-packages.proj" Category="libs" Pack="true" /> - </ItemGroup> - <ItemGroup Condition="$(_subset.Contains('+libs.tests+'))"> <ProjectToBuild Include="$(LibrariesProjectRoot)tests.proj" Category="libs" Test="true" /> </ItemGroup> |