From 502c0828460d05857dae5e71c9573d991fa4da31 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Fri, 30 Jun 2017 12:17:20 -0700
Subject: [PATCH 1/2] Publishing a 'coherent' badge.

---
 build/Publish.targets       | 42 ++++++++++++++++++++++++++++++-------
 build/VersionBadge.props    |  5 +++--
 build/publish/Badge.targets | 12 +++++++++++
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index d38175d64b..e1608b8e5d 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -16,13 +16,15 @@
 
   <!-- 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;
+                             PublishCliCoherentBadge" />
 
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
@@ -65,4 +67,30 @@
       ContainerName="$(ArtifactContainerName)"
       Items="@(CliVersionBadgeToUpload)" />
   </Target>
+
+  <Target Name="PublishCliCoherentBadge"
+          Condition=" '$(Coherent)' == 'true' ">
+    <ItemGroup>
+      <CliCoherentBadgeToUpload Include="$(CoherentBadge)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <CliCoherentBadgeToUpload>
+        <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
+      </CliCoherentBadgeToUpload>
+    </ItemGroup>
+
+    <UploadToAzure
+      AccountKey="$(ArtifactCloudDropAccessToken)"
+      AccountName="$(ArtifactCloudDropAccountName)"
+      ContainerName="$(ArtifactContainerName)"
+      Items="@(CliCoherentBadgeToUpload)"
+      Overwrite="$(OverwriteOnPublish)" />
+
+    <SetBlobPropertiesBasedOnFileType 
+      AccountKey="$(ArtifactCloudDropAccessToken)"
+      AccountName="$(ArtifactCloudDropAccountName)"
+      ContainerName="$(ArtifactContainerName)"
+      Items="@(CliCoherentBadgeToUpload)" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/build/VersionBadge.props b/build/VersionBadge.props
index 42f210be03..b0d2ca4179 100644
--- a/build/VersionBadge.props
+++ b/build/VersionBadge.props
@@ -1,11 +1,12 @@
 <Project>
   <PropertyGroup>
-    <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker> 
+    <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
     <VersionBadgeMoniker Condition=" '$(Rid)' == 'ubuntu.16.04-x64' ">ubuntu_16_04_x64</VersionBadgeMoniker>
     <VersionBadgeMoniker Condition=" '$(Rid)' == 'ubuntu.16.10-x64' ">ubuntu_16_10_x64</VersionBadgeMoniker>
     <VersionBadgeMoniker Condition=" '$(Rid)' == 'fedora.24-x64' ">fedora_24_x64</VersionBadgeMoniker>
     <VersionBadgeMoniker Condition=" '$(Rid)' == 'opensuse.42.1-x64' ">opensuse_42_1_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>
diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets
index 7c87a7ac6c..d80313c199 100644
--- a/build/publish/Badge.targets
+++ b/build/publish/Badge.targets
@@ -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>
\ No newline at end of file

From af660e5a76fd5298523da9a50df7a3cc56c18612 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Mon, 3 Jul 2017 14:34:04 -0700
Subject: [PATCH 2/2] Conserving code-lines.

---
 build/Publish.targets | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index e1608b8e5d..48c4db93d5 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -23,8 +23,7 @@
                              UploadArtifactsToAzure;
                              UploadChecksumsToAzure;
                              PublishDebFilesToDebianRepo;
-                             PublishCliVersionBadge;
-                             PublishCliCoherentBadge" />
+                             PublishCliVersionBadge" />
 
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
@@ -46,6 +45,8 @@
   <Target Name="PublishCliVersionBadge">
     <ItemGroup>
       <CliVersionBadgeToUpload Include="$(VersionBadge)" />
+      <CliVersionBadgeToUpload Include="$(CoherentBadge)"
+              Condition=" '$(Coherent)' == 'true' " />
     </ItemGroup>
 
     <ItemGroup>
@@ -67,30 +68,4 @@
       ContainerName="$(ArtifactContainerName)"
       Items="@(CliVersionBadgeToUpload)" />
   </Target>
-
-  <Target Name="PublishCliCoherentBadge"
-          Condition=" '$(Coherent)' == 'true' ">
-    <ItemGroup>
-      <CliCoherentBadgeToUpload Include="$(CoherentBadge)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <CliCoherentBadgeToUpload>
-        <RelativeBlobPath>$(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
-      </CliCoherentBadgeToUpload>
-    </ItemGroup>
-
-    <UploadToAzure
-      AccountKey="$(ArtifactCloudDropAccessToken)"
-      AccountName="$(ArtifactCloudDropAccountName)"
-      ContainerName="$(ArtifactContainerName)"
-      Items="@(CliCoherentBadgeToUpload)"
-      Overwrite="$(OverwriteOnPublish)" />
-
-    <SetBlobPropertiesBasedOnFileType 
-      AccountKey="$(ArtifactCloudDropAccessToken)"
-      AccountName="$(ArtifactCloudDropAccountName)"
-      ContainerName="$(ArtifactContainerName)"
-      Items="@(CliCoherentBadgeToUpload)" />
-  </Target>
 </Project>
\ No newline at end of file