From 443f6e0a9497f4ea686a65fc042b87177192cf65 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Thu, 24 Jan 2019 14:00:22 -0800
Subject: [PATCH] Fix manifest publishing

---
 .vsts-ci.yml         | 7 -------
 eng/Publishing.props | 7 ++++---
 eng/build.yml        | 1 -
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 0b0de0314..565d59b50 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -45,21 +45,18 @@ jobs:
             _BuildArchitecture: x86
             _DOTNET_CLI_UI_LANGUAGE: ''
             _DropSuffix: ''
-            _PublishBuildAssetManifest: true
         # Always run builds
         Build_Release_x64:
           _BuildConfig: Release
           _BuildArchitecture: x64
           _DOTNET_CLI_UI_LANGUAGE: ''
           _DropSuffix: ''
-          _PublishBuildAssetManifest: true
         Build_Release_arm:
           _BuildConfig: Release
           _BuildArchitecture: arm
           _DOTNET_CLI_UI_LANGUAGE: ''
           _DropSuffix: ''
           _AdditionalBuildParameters: '/p:DisableSourceLink=true'
-          _PublishBuildAssetManifest: true
 
 - template: /eng/build.yml
   parameters:
@@ -176,7 +173,6 @@ jobs:
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'arm'
             _DropSuffix: ''
-            _PublishBuildAssetManifest: true
           Build_Arm64_Release:
             _BuildConfig: Release
             _DockerParameter: ''
@@ -184,7 +180,6 @@ jobs:
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'arm64'
             _DropSuffix: ''
-            _PublishBuildAssetManifest: true
           Build_Rhel_6_Release_x64:
             _BuildConfig: Release
             _DockerParameter: '--docker rhel.6'
@@ -227,7 +222,6 @@ jobs:
           _RuntimeIdentifier: ''
           _BuildArchitecture: 'x64'
           _DropSuffix: ''
-          _PublishBuildAssetManifest: true
 
 - template: /eng/build.yml
   parameters:
@@ -239,7 +233,6 @@ jobs:
       matrix:
         Build_Release:
           _BuildConfig: Release
-          _PublishBuildAssetManifest: true
 
 # https://github.com/dotnet/core-sdk/issues/248
 # - template: /eng/build.yml
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 2846f7c9e..3119df565 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -27,8 +27,9 @@
              that exists in the container. Disambiguate the manifests via RID -->
       <AssetManifestFileName>$(OS)-$(PlatformName)</AssetManifestFileName>
       <AssetManifestFileName Condition="'$(Rid)' != ''">$(AssetManifestFileName)-$(Rid)</AssetManifestFileName>
-      <AssetManifestFileName>$(AssetManifestFileName).xml</AssetManifestFileName>
-      <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName)</AssetManifestFilePath>
+      <ChecksumsAssetManifestFileName>$(AssetManifestFileName)-checksums</ChecksumsAssetManifestFileName>
+      <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName).xml</AssetManifestFilePath>
+      <ChecksumsAssetManifestFilePath>$(ChecksumsAssetManifestFileName).xml</CheckSumsAssetManifestFilePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -85,7 +86,7 @@
       ManifestBranch="$(BUILD_SOURCEBRANCH)"
       ManifestBuildId="$(BUILD_BUILDNUMBER)"
       ManifestCommit="$(BUILD_SOURCEVERSION)"
-      AssetManifestPath="$(AssetManifestFilePath)"
+      AssetManifestPath="$(ChecksumsAssetManifestFilePath)"
       PublishFlatContainer="true"/>
   </Target>
 </Project>
diff --git a/eng/build.yml b/eng/build.yml
index fbbebfcb2..062057af1 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -46,7 +46,6 @@ phases:
                   /p:PB_PublishType=blob
                   /p:DotnetPublishChecksumsBlobFeedUrl=$(_PublishChecksumsBlobFeedUrl)
                   /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key)
-                  /p:AssetManifestFilePath=$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest/$(Agent.OS)_$(_BuildArchitecture).xml
                   /p:DotNetSignType=real
                   /p:TeamName=$(_TeamName)