Skip to content

Commit 2d0196b

Browse files
committed
Fix package authoring
1 parent f2485fb commit 2d0196b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

eng/dashboardpack/Common.projitems

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageType />
1111
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1212
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
13+
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
1314
<IncludeBuildOutput>false</IncludeBuildOutput>
1415
<PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
1516
</PropertyGroup>
@@ -24,7 +25,7 @@
2425
</ItemGroup>
2526

2627
<ItemGroup>
27-
<None Include="build*/*.props;**/*.targets" Pack="true" PerformTextReplacement="true" PackagePath="%(RecursiveDir)$(AssemblyName)%(Extension)" />
28+
<None Include="build*/*.props;build*/*.targets" Pack="true" PerformTextReplacement="true" PackagePath="%(RecursiveDir)$(AssemblyName)%(Extension)" />
2829
</ItemGroup>
2930

3031
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

eng/dcppack/Common.projitems

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1212
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1313
<IncludeBuildOutput>false</IncludeBuildOutput>
14+
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
1415
<PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
1516
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPackageFiles</TargetsForTfmSpecificContentInPackage>
1617
</PropertyGroup>
@@ -30,7 +31,7 @@
3031
</ItemGroup>
3132

3233
<ItemGroup>
33-
<None Include="build*/*.props;**/*.targets" Pack="true" PerformTextReplacement="true" PackagePath="%(RecursiveDir)$(AssemblyName)%(Extension)" />
34+
<None Include="**/*.targets" Pack="true" PerformTextReplacement="true" PackagePath="%(RecursiveDir)$(AssemblyName)%(Extension)" />
3435
</ItemGroup>
3536

3637
<!-- Package downloads to DCP packages as we need to repack the binaries from them -->
@@ -75,7 +76,7 @@
7576
</Target>
7677

7778
<ItemGroup>
78-
<None Include="Aspire.Hosting.Orchestration.targets" pack="true" PackagePath="build/$(PackageId).targets" />
79+
<None Update="Aspire.Hosting.Orchestration.targets" PerformTextReplacement="" pack="true" PackagePath="build/$(PackageId).targets" />
7980
<None Include="UnixFilePermissions.xml" Pack="true" PackagePath="data/" Condition=" '$(DcpPlatformType)' == 'Unix' " />
8081
</ItemGroup>
8182

0 commit comments

Comments
 (0)