mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move badge prop to target

Browse source 
To have the correct IsBuildingAndPublishingAllLinuxDistrosNativeInstallers value
This commit is contained in:
William Li 2017-09-14 17:07:19 -07:00 • committed by William Lee
parent f6fda26ec8
commit 7c64ef6b0e
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Directory.Build.props
View file

@ -57,7 +57,6 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
<Import Project="build/BundledTemplates.props" /> <Import Project="build/BundledTemplates.props" />
<Import Project="build/BuildDefaults.props" /> <Import Project="build/BuildDefaults.props" />
<Import Project="build/VersionBadge.props" />
<Import Project="build/BundledRuntimes.props" /> <Import Project="build/BundledRuntimes.props" />
<Import Project="build/CrossGen.props" /> <Import Project="build/CrossGen.props" />
<Import Project="build/BackwardsCompatibilityRuntimes.props" /> <Import Project="build/BackwardsCompatibilityRuntimes.props" />

1
Microsoft.DotNet.Cli.sln
View file

@ -57,7 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\Signing.proj = build\Signing.proj build\Signing.proj = build\Signing.proj
build\Test.targets = build\Test.targets build\Test.targets = build\Test.targets
build\Version.props = build\Version.props build\Version.props = build\Version.props
build\VersionBadge.props = build\VersionBadge.props
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"

1
build/Publish.targets
View file

@ -11,6 +11,7 @@
<Target Name="Publish" <Target Name="Publish"
Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' " Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
DependsOnTargets="Init; DependsOnTargets="Init;
SetBadgeProps;
EvaluateRuntimeCoherence; EvaluateRuntimeCoherence;
PublishArtifacts; PublishArtifacts;
FinishBuild" /> FinishBuild" />

10
build/VersionBadge.props
View file

@ -1,10 +0,0 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_x64</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
<CoherentBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_coherent_badge.svg</CoherentBadge>
</PropertyGroup>
</Project>

11
build/publish/Badge.targets
View file

@ -26,4 +26,15 @@
ReplacementPatterns="ver_number" ReplacementPatterns="ver_number"
ReplacementStrings="$(SdkVersion)" /> ReplacementStrings="$(SdkVersion)" />
</Target> </Target>
<Target Name="SetBadgeProps">
<PropertyGroup>
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_x64</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
<CoherentBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_coherent_badge.svg</CoherentBadge>
</PropertyGroup>
</Target>
</Project> </Project>