Skip to content

Commit 21a361d

Browse files
committed
Fix really silly condition inversion
1 parent 57897d5 commit 21a361d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ NOTE: This file is imported from the following contexts, so be aware when writin
7777
so that the Publish of those kinds of packages isn't implicitly coerced to be platform-specific in any way.
7878
We _do_ have to set both SelfContained and PublishSelfContained here because the logic that applies PublishSelfContained to
7979
SelfContained has already run. -->
80-
<PublishSelfContained Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</PublishSelfContained>
81-
<SelfContained Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</SelfContained>
82-
<PublishTrimmed Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</PublishTrimmed>
83-
<PublishReadyToRun Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</PublishReadyToRun>
84-
<PublishSingleFile Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</PublishSingleFile>
85-
<PublishAot Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and !$(_IsPacking)">false</PublishAot>
80+
<PublishSelfContained Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</PublishSelfContained>
81+
<SelfContained Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</SelfContained>
82+
<PublishTrimmed Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</PublishTrimmed>
83+
<PublishReadyToRun Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</PublishReadyToRun>
84+
<PublishSingleFile Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</PublishSingleFile>
85+
<PublishAot Condition="!$(_IsRidSpecific) and !$(_IsImplicitRestore) and $(_IsPacking)">false</PublishAot>
8686

8787
<!-- Tool implementation files are not included in the primary package when the tool has RID-specific packages. So only pack the tool implementation
8888
(and only depend on publish) if there are no RID-specific packages, or if the RuntimeIdentifier is set. -->

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Copyright (c) .NET Foundation. All rights reserved.
121121
<PreferNativeArm64 Condition="'$(PreferNativeArm64)'==''">false</PreferNativeArm64>
122122
<SignAssembly Condition="'$(SignAssembly)'==''">false</SignAssembly>
123123
<DelaySign Condition="'$(DelaySign)'==''">false</DelaySign>
124+
<!-- TODO: should we set _IsPacking=true on the NuGet Pack targets when they hook up the 'generate package on build' stuff -->
124125
<GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)'==''">false</GeneratePackageOnBuild>
125126
<PackageRequireLicenseAcceptance Condition="'$(PackageRequireLicenseAcceptance)'==''">false</PackageRequireLicenseAcceptance>
126127
<DebugSymbols Condition="'$(DebugSymbols)'==''">false</DebugSymbols>

0 commit comments

Comments
 (0)