Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Merge rel/1.1.0 to release/2.0.0 #7073

Merged
livarcocc merged 10 commits into from
Jul 5, 2017
Merged

Merge rel/1.1.0 to release/2.0.0 #7073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0dd4f12
Update Template Engine and templates for 1.x
mlorbetske Jun 30, 2017
4454c4e
Update the SDK to 1.1.0-alpha-20170630-2
Jun 30, 2017
47ef990
chmod .sh files
KevinRansom Jun 30, 2017
3d9bcf4
Copy Paste error
KevinRansom Jun 30, 2017
502c082
Publishing a 'coherent' badge.
Jun 30, 2017
24c9e56
Merge pull request #7046 from KevinRansom/mlorbetske-dev/mlorbe/Updat…
Jul 3, 2017
af660e5
Conserving code-lines.
Jul 3, 2017
7d60549
Merge branch 'release/2.0.0' into CoherentBadgePublish
Jul 4, 2017
fc936a7
Merge pull request #7047 from johnbeisner/CoherentBadgePublish
johnbeisner Jul 5, 2017
ba5e56c
Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0…
livarcocc Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions build/Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

<!-- UploadToAzure target comes from Build Tools -->
<Target Name="PublishArtifacts"
DependsOnTargets="GenerateVersionBadge;
GatherItemsForPattern;
GenerateChecksums;
UploadArtifactsToAzure;
UploadChecksumsToAzure;
PublishDebFilesToDebianRepo;
PublishCliVersionBadge" />
DependsOnTargets="GenerateVersionBadge;
GenerateCoherentBadge;
GatherItemsForPattern;
GenerateChecksums;
UploadArtifactsToAzure;
UploadChecksumsToAzure;
PublishDebFilesToDebianRepo;
PublishCliVersionBadge" />

<Target Name="GatherItemsForPattern">
<ItemGroup>
Expand All @@ -44,6 +45,8 @@
<Target Name="PublishCliVersionBadge">
<ItemGroup>
<CliVersionBadgeToUpload Include="$(VersionBadge)" />
<CliVersionBadgeToUpload Include="$(CoherentBadge)"
Condition=" '$(Coherent)' == 'true' " />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion build/VersionBadge.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<VersionBadgeMoniker Condition=" '$(HostRid)' == 'ubuntu.16.10-x64' ">ubuntu_16_10_x64</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_x64</VersionBadgeMoniker>

<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
<CoherentBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_coherent_badge.svg</CoherentBadge>
</PropertyGroup>
</Project>
12 changes: 12 additions & 0 deletions build/publish/Badge.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@
ReplacementPatterns="ver_number"
ReplacementStrings="$(SdkVersion)" />
</Target>

<Target Name="GenerateCoherentBadge"
DependsOnTargets="Init; EvaluateRuntimeCoherence"
Condition=" '$(Coherent)' == 'true' ">
<Message Text="$(CoherentBadge)" />

<ReplaceFileContents
InputFile="$(VersionSvgTemplate)"
DestinationFile="$(CoherentBadge)"
ReplacementPatterns="ver_number"
ReplacementStrings="$(SdkVersion)" />
</Target>
</Project>