diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2021-08-11 13:50:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 13:50:46 +0300 |
| commit | 85441ce69b81dfd5bf57b9d00ba525440b7bb25d (patch) | |
| tree | cc61690fc004f48c81af08b204da05ff192e28f5 /Directory.Build.targets | |
| parent | c0662e8129beaf93b8050d39a863cc6d16a0308c (diff) | |
Make sure rid specific libs projs get packaged (#57193)
* Make sure rid specific libs projs get packaged
RID specific runtime.*.runtime.native.System.IO.Ports projects weren't
packaged because the GeneratePackageOnBuild property wasn't set to true
for them. The property was only true during an allconfigurations build.
As these projects are only built outside of an allconfigurations build,
the GeneratePackageOnBuild property needs to account for such as well.
Also updating the NoTargets Sdk to clean the rid specific package up.
Moving the GeneratePackageOnBuild logic into a props file and set it to
false during servicing (or runtimelab) so that devs can set the property
during servicing directly in the project file if a project should be
packaged.
* Remove the GeneratePackage property
That property was intended to enabled incremental servicing but with
now using the NuGet Pack task we can just make use of the publicl
available GeneratePackageOnBuild property.
* Fix IsPackable setting
Diffstat (limited to 'Directory.Build.targets')
| -rw-r--r-- | Directory.Build.targets | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index f8e663fdc26..d0c69879774 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,4 @@ -<Project InitialTargets="_OverridePackDependsOn"> +<Project> <PropertyGroup> <!-- For non-SDK projects that import this file and then import Microsoft.Common.targets, @@ -54,24 +54,8 @@ <PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription> <!-- Keep in sync as required by the Packaging SDK in Arcade. --> <Description>$(PackageDescription)</Description> - <GenerateNuspecDependsOn>ErrorForMissingPackageDescription;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn> </PropertyGroup> - <!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. --> - <Target Name="ErrorForMissingPackageDescription" - Condition="'$(PackageDescription)' == ''"> - <Error Text="Required property 'PackageDescription' is missing for $(MSBuildProjectName)." /> - </Target> - - <!-- <GeneratePackage /> controls if a package should be created by clearing out <PackDependsOn />. --> - <Target Name="_OverridePackDependsOn" - Condition="'$(IsPackable)' == 'true' and - '$(GeneratePackage)' != 'true'"> - <PropertyGroup> - <PackDependsOn /> - </PropertyGroup> - </Target> - <!-- Arcade SDK versioning is defined by static properties in a targets file: work around this by moving properties based on versioning into a target. |