Cleanup publish.proj to use arcade's target to push to blob feed (dotnet/corefx#34373)

Commit migrated from https://github.com/dotnet/corefx/commit/21e5926a140fc76dfa54e3e80e4cb87b04e33a6d

diff --git a/eng/pipelines/libraries/publish.yml b/eng/pipelines/libraries/publish.yml
index 62fe6b9..a81fdba 100644 (file)
--- a/eng/pipelines/libraries/publish.yml
+++ b/eng/pipelines/libraries/publish.yml
@@ -43,13 +43,14 @@ jobs:
 
       - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 eng\publish.proj
                 -warnaserror:0 -ci
-                /t:PublishToAzureBlobFeed
+                /t:PublishPackagesToBlobFeed
                 /p:ManifestBuildId=$(Build.BuildNumber)
                 /p:ManifestBranch=$(Build.SourceBranchName)
                 /p:ManifestCommit=$(Build.SourceVersion)
                 /p:ManifestRepoUri=$(Build.Repository.Uri)
                 /p:AccountKey=$(dotnetfeed-storage-access-key-1)
                 /p:ExpectedFeedUrl=$(_dotnetFeedUrl)
+                /p:IncludeSymbolsOnPackagePublish=true
         displayName: Push to dotnet feed
 
       - task: PublishBuildArtifacts@1

diff --git a/eng/publish.proj b/eng/publish.proj
index 472ed3d..a08f86b 100644 (file)
--- a/eng/publish.proj
+++ b/eng/publish.proj
@@ -8,8 +8,8 @@
 
   <PropertyGroup>
     <GitHubRepositoryName Condition="'$(GitHubRepositoryName)' == ''">corefx</GitHubRepositoryName>
-    <AssetManifestFileName Condition="'$(AssetsManifestFileName)' == '' AND '$(ManifestBuildId)' != ''">$(GitHubRepositoryName)-$(ManifestBuildId)</AssetManifestFileName>
-    <AssetManifestFileName Condition="'$(AssetsManifestFileName)' == ''">$(GitHubRepositoryName)</AssetManifestFileName>
+    <AssetManifestFileName Condition="'$(AssetManifestFileName)' == '' AND '$(ManifestBuildId)' != ''">$(GitHubRepositoryName)-$(ManifestBuildId)</AssetManifestFileName>
+    <AssetManifestFileName Condition="'$(AssetManifestFileName)' == ''">$(GitHubRepositoryName)</AssetManifestFileName>
     <AssetManifestFilePath>$(ArtifactsDir)AssetManifests\$(AssetManifestFileName).xml</AssetManifestFilePath>
 
     <PackageOutputRoot Condition="'$(PackagesOutputRoot)' == ''">$(ArtifactsDir)/packages/</PackageOutputRoot>
@@ -38,28 +38,11 @@
       <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
     </SymbolPackagesToPublish>
 
+    <PackagesToPublish Condition="'$(IncludeSymbolsOnPackagePublish)' == 'true'" Include="@(SymbolPackagesToPublish)" />
+
     <PublishSymbolsDependsOn Include="SetupPublishSymbols" />
   </ItemGroup>
 
-  <Target Name="PublishToAzureBlobFeed">
-    <Error Condition="'@(PackagesToPublish)'==''" Text="PackagesToPublish for packages is empty." />
-
-    <!-- Include Symbols when publishing to blob feed so that the manifest contains symbols and we send all the assets to BAR -->
-    <ItemGroup>
-      <PackagesToPublish Include="@(SymbolPackagesToPublish)" />
-    </ItemGroup>
-
-    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(PackagesToPublish)"
-                    Overwrite="$(PublishOverwrite)"
-                    AssetManifestPath="$(AssetManifestFilePath)"
-                    ManifestBuildId="$(ManifestBuildId)"
-                    ManifestBranch="$(ManifestBranch)"
-                    ManifestCommit="$(ManifestCommit)"
-                    ManifestRepoUri="$(ManifestRepoUri)" />
-  </Target>
-
   <Target Name="NuGetPush">
 
     <Error Condition="'$(NuGetSource)' == ''" Text="NuGetSource property is not defined." />