Skip to content

Commit 2eb97de

Browse files
committed
Use common property for determining prebuilt feed inclusion
1 parent 2e4029b commit 2eb97de

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/SourceBuild/content/repo-projects/Directory.Build.targets

+7-4
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@
173173
<PrebuiltNuGetSourceName>prebuilt</PrebuiltNuGetSourceName>
174174
<PreviouslySourceBuiltNuGetSourceName>previously-source-built</PreviouslySourceBuiltNuGetSourceName>
175175
<ReferencePackagesNuGetSourceName>reference-packages</ReferencePackagesNuGetSourceName>
176+
177+
<AddPrebuiltFeeds>true</AddPrebuiltFeeds>
178+
<AddPrebuiltFeeds Condition="'$(DotNetSourceOnlyTestOnly)' == 'true'">false</AddPrebuiltFeeds>
176179
</PropertyGroup>
177180

178181
<ItemGroup>
@@ -198,7 +201,7 @@
198201

199202
<ItemGroup>
200203
<_BuildSources Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)"
201-
Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetSourceOnlyTestOnly)' != 'true'"/>
204+
Condition="'$(AddPrebuiltFeeds)' == 'true'"/>
202205
<_BuildSources Include="@(_CommonBuildSources)" />
203206
<_BuildSources Include="$(NetSdkSupportingFeedName)"
204207
Condition="'$(AddNetSdkSupportingFeed)' == 'true'" />
@@ -213,17 +216,17 @@
213216
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
214217
SourceName="$(PrebuiltNuGetSourceName)"
215218
SourcePath="$(PrebuiltPackagesPath)"
216-
Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetSourceOnlyTestOnly)' != 'true'" />
219+
Condition="'$(AddPrebuiltFeeds)' == 'true'" />
217220

218221
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
219222
SourceName="$(PreviouslySourceBuiltNuGetSourceName)"
220223
SourcePath="$(PrebuiltSourceBuiltPackagesPath)"
221-
Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetSourceOnlyTestOnly)' != 'true'" />
224+
Condition="'$(AddPrebuiltFeeds)' == 'true'" />
222225

223226
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
224227
SourceName="$(ReferencePackagesNuGetSourceName)"
225228
SourcePath="$(ReferencePackagesDir)"
226-
Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetSourceOnlyTestOnly)' != 'true'" />
229+
Condition="'$(AddPrebuiltFeeds)' == 'true'" />
227230

228231
<AddSourceToNuGetConfig NuGetConfigFile="$(NuGetConfigFile)"
229232
SourceName="%(RepositoryReferenceInfo.ShippingSourceName)"

0 commit comments

Comments
 (0)