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

Add GeneratePackage property to pkgproj infra #6728

Merged
merged 2 commits into from
Dec 30, 2020
Merged

Add GeneratePackage property to pkgproj infra #6728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177c628
Add GeneratePackage property to pkgproj infra
ViktorHofer Dec 29, 2020
9cd4eeb
Update Packaging.targets
ViktorHofer Dec 29, 2020
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
6 changes: 4 additions & 2 deletions ...osoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<IsPackable Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">true</IsPackable>
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
<IsPackable>true</IsPackable>
<!-- Additional property which no-ops the pkgproj entrypoint targets for more flexibility during servicing. -->
<GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@

<!-- Redefine build to just create the NuSpec only, we'll create the package during ArcProjects phase -->
<Target Name="Build"
Condition="'$(GeneratePackage)' == 'true'"
DependsOnTargets="$(BuildDependsOn)">

<Message Condition="'$(ShouldCreatePackage)' == 'true'"
Expand Down