Skip to content

Commit 2b74f1f

Browse files
committed
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.
1 parent f2f9fab commit 2b74f1f

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

Directory.Build.props

-6
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,6 @@
259259
<IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
260260
<!-- We don't want Private packages to be shipped to NuGet.org -->
261261
<IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
262-
<!-- A package isn't generated if in servicing or in runtimelab. Intended to be overridden at project level.
263-
Excluding .sfxprojs as they have their own incremental servicing infra. -->
264-
<GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage>
265-
<GeneratePackage Condition="(('$(PreReleaseVersionLabel)' == 'servicing' or
266-
'$(GitHubRepositoryName)' == 'runtimelab') and
267-
'$(MSBuildProjectExtension)' != '.sfxproj')">false</GeneratePackage>
268262
<PlaceholderFile>$(RepositoryEngineeringDir)_._</PlaceholderFile>
269263
</PropertyGroup>
270264

Directory.Build.targets

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project InitialTargets="_OverridePackDependsOn">
1+
<Project>
22
<PropertyGroup>
33
<!--
44
For non-SDK projects that import this file and then import Microsoft.Common.targets,
@@ -54,24 +54,8 @@
5454
<PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription>
5555
<!-- Keep in sync as required by the Packaging SDK in Arcade. -->
5656
<Description>$(PackageDescription)</Description>
57-
<GenerateNuspecDependsOn>ErrorForMissingPackageDescription;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
5857
</PropertyGroup>
5958

60-
<!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. -->
61-
<Target Name="ErrorForMissingPackageDescription"
62-
Condition="'$(PackageDescription)' == ''">
63-
<Error Text="Required property 'PackageDescription' is missing for $(MSBuildProjectName)." />
64-
</Target>
65-
66-
<!-- <GeneratePackage /> controls if a package should be created by clearing out <PackDependsOn />. -->
67-
<Target Name="_OverridePackDependsOn"
68-
Condition="'$(IsPackable)' == 'true' and
69-
'$(GeneratePackage)' != 'true'">
70-
<PropertyGroup>
71-
<PackDependsOn />
72-
</PropertyGroup>
73-
</Target>
74-
7559
<!--
7660
Arcade SDK versioning is defined by static properties in a targets file: work around this by
7761
moving properties based on versioning into a target.

0 commit comments

Comments
 (0)