Skip to content

Commit 12d0a2d

Browse files
authored
Add version to blob path (#2048)
1 parent 9ba841b commit 12d0a2d

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

eng/Publishing.props

+7-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
14-
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers;_PublishDashboardAssets</PublishDependsOnTargets>
14+
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishBlobItems</PublishDependsOnTargets>
1515

1616
<!-- NOTE: This property is also defined on the root-level Directory.Build.props, but that file is not imported by the Publishing project.
1717
Pulling it in here will cause different issues as that file will conflict with Arcade's publishing logic, so as a workaround we define it here.
@@ -25,17 +25,7 @@
2525
<_DashboardFilesToPublish Include="$(DashboardPublishedArtifactsOutputDir)\**\*.zip" />
2626
</ItemGroup>
2727

28-
<Target Name="_PublishDashboardAssets">
29-
<ItemGroup>
30-
<ItemsToPushToBlobFeed Include="@(_DashboardFilesToPublish)">
31-
<IsShipping>true</IsShipping>
32-
<PublishFlatContainer>true</PublishFlatContainer>
33-
<RelativeBlobPath>$(_UploadPathRoot)/dashboard-assets/%(Filename)%(Extension)</RelativeBlobPath>
34-
</ItemsToPushToBlobFeed>
35-
</ItemGroup>
36-
</Target>
37-
38-
<Target Name="_PublishInstallers">
28+
<Target Name="_PublishBlobItems">
3929
<MSBuild Projects="$(RepoRoot)src\Microsoft.NET.Sdk.Aspire\Microsoft.NET.Sdk.Aspire.csproj"
4030
Targets="ReturnPackageVersion"
4131
SkipNonexistentProjects="false">
@@ -53,6 +43,11 @@
5343
<PublishFlatContainer>true</PublishFlatContainer>
5444
<RelativeBlobPath>$(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
5545
</ItemsToPushToBlobFeed>
46+
<ItemsToPushToBlobFeed Include="@(_DashboardFilesToPublish)">
47+
<IsShipping>true</IsShipping>
48+
<PublishFlatContainer>true</PublishFlatContainer>
49+
<RelativeBlobPath>$(_UploadPathRoot)/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
50+
</ItemsToPushToBlobFeed>
5651
</ItemGroup>
5752
</Target>
5853
</Project>

0 commit comments

Comments
 (0)