Skip to content

Commit 556271b

Browse files
authored
Extract version badge generation from redist-installer.proj (dotnet#47544)
1 parent e66d8ab commit 556271b

File tree

6 files changed

+53
-36
lines changed

6 files changed

+53
-36
lines changed

eng/Badge.proj

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.Build.NoTargets">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(NetCurrent)</TargetFramework>
5+
<IsShippingPackage>true</IsShippingPackage>
6+
</PropertyGroup>
7+
8+
<Target Name="GenerateVersionBadge" AfterTargets="Build" Returns="$(VersionBadge)">
9+
<PropertyGroup>
10+
<!-- Replace '-' with '_' for os names like 'linux-musl' -->
11+
<VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(Architecture)</VersionBadgeMoniker>
12+
<VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(Architecture)</VersionBadgeMoniker>
13+
14+
<VersionBadge>$(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
15+
<VersionSvgTemplate>$(MSBuildThisFileDirectory)version_badge.svg</VersionSvgTemplate>
16+
</PropertyGroup>
17+
18+
<Message Text="$(VersionBadge)" />
19+
20+
<WriteLinesToFile
21+
File="$(VersionBadge)"
22+
Lines="$([System.IO.File]::ReadAllText('$(VersionSvgTemplate)').Replace('ver_number', '$(Version)'))"
23+
Overwrite="true"
24+
WriteOnlyWhenDifferent="true" />
25+
</Target>
26+
27+
</Project>

eng/Publishing.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,18 @@
4545
</ItemGroup>
4646
</Target>
4747

48+
<Target Name="GenerateVersionBadge"
49+
Condition="'$(PublishBinariesAndBadge)' == 'true' and
50+
'$(PgoInstrument)' != 'true' and
51+
('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')"
52+
BeforeTargets="AddRelativeBlobPathToBlobArtifacts;PublishToAzureDevOpsArtifacts">
53+
<MSBuild Projects="$(RepositoryEngineeringDir)Badge.proj" Targets="GenerateVersionBadge">
54+
<Output TaskParameter="TargetOutputs" ItemName="VersionBadge" />
55+
</MSBuild>
56+
57+
<ItemGroup>
58+
<Artifact Include="@(VersionBadge)" Kind="Blob" />
59+
</ItemGroup>
60+
</Target>
61+
4862
</Project>

eng/Signing.props

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,21 @@
8989

9090
<!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
9191
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
92-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" IsShipping="true" />
93-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" />
92+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />
93+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" />
9494
</ItemGroup>
9595

9696
<ItemGroup>
97-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
98-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
99-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" IsShipping="true" />
100-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" IsShipping="true" />
101-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" IsShipping="true" />
102-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" IsShipping="true" />
103-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" IsShipping="true" />
104-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" IsShipping="true" />
105-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.svg" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
106-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
107-
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
97+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
98+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
99+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" />
100+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" />
101+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" />
102+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" />
103+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" />
104+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" />
105+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
106+
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
108107

109108
<SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.swr" IsShipping="false" />
110109
<SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.msi" IsShipping="false" />

src/Installer/redist-installer/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<Import Project="targets\GenerateBundledVersions.targets" />
4040
<Import Project="targets\Crossgen.targets" />
4141
<Import Project="targets\GenerateLayout.targets" />
42-
<Import Project="targets\Badge.targets" Condition="'$(PgoInstrument)' != 'true'" />
4342
<Import Project="targets\GenerateArchives.targets" />
4443
</ImportGroup>
4544

src/Installer/redist-installer/targets/Badge.targets

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)