[netcore] Add back pushing to blob feed in AzDO pipeline

1 files changed, 53 insertions, 21 deletions

diff --git a/scripts/ci/pipeline-netcore-runtime.yml b/scripts/ci/pipeline-netcore-runtime.yml
index 525eae6a3f0..8063a99441b 100644
--- a/scripts/ci/pipeline-netcore-runtime.yml
+++ b/scripts/ci/pipeline-netcore-runtime.yml
@@ -24,12 +24,14 @@ stages:
   jobs:
   - template: /eng/common/templates/jobs/jobs.yml
     parameters:
-      enablePublishUsingPipelines: true
+      enablePublishBuildArtifacts: true
       enablePublishBuildAssets: true
+      enablePublishUsingPipelines: true
       variables:
-        - _PublishUsingPipelines: true
         - _BuildConfig: Debug  # we only do Debug builds of csproj in netcore/ and this needs to match for arcade to find logs
       jobs:
+
+      ############ LINUX BUILD ############
       - job: Build_Linux
         displayName: Linux
         timeoutInMinutes: 90
@@ -37,7 +39,9 @@ stages:
           matrix:
             x64:
               poolname: Hosted Ubuntu 1604
+              manifest: linux-x64
             ARM64:
+              manifest: linux-arm64
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
                 poolname: Xamarin-ARM64
               ${{ if eq(variables['System.TeamProject'], 'internal') }}:
@@ -56,12 +60,12 @@ stages:
           displayName: 'Prepare Linux dependencies'
           condition: eq(variables['poolname'], 'Hosted Ubuntu 1604')
 
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-          - bash: |
-              sed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
-            env:
-              dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
-            displayName: 'Rewrite .gitmodules'
+        - bash: |
+            sed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
+          env:
+            dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
+          displayName: 'Rewrite .gitmodules'
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')
 
         - bash: |
             cd netcore
@@ -108,6 +112,15 @@ stages:
           timeoutInMinutes: 90
           condition: eq(variables['System.TeamProject'], 'public')
 
+        - script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.csproj
+          displayName: Restore blob feed tasks
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+        - script: ./eng/common/msbuild.sh --ci $(Build.SourcesDirectory)/eng/publishwitharcade.proj /p:AzureFeedUrl=$(dotnetFeedUrl) /p:AzureAccountKey=$(dotnetfeed-storage-access-key-1) /p:AssetManifest=$(manifest)
+          displayName: Publish packages to blob feed
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+      ############ MACOS BUILD ############
       - job: Build_macOS
         displayName: macOS
         timeoutInMinutes: 90
@@ -115,6 +128,7 @@ stages:
           matrix:
             x64:
               poolname: Hosted macOS
+              manifest: osx-x64
         pool:
           name: $(poolname)
         steps:
@@ -126,12 +140,12 @@ stages:
             brew install autoconf automake libtool gnu-sed
           displayName: 'Prepare macOS dependencies'
 
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-          - bash: |
-              gsed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
-            env:
-              dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
-            displayName: 'Rewrite .gitmodules'
+        - bash: |
+            gsed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
+          env:
+            dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
+          displayName: 'Rewrite .gitmodules'
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')
 
         - bash: |
             cd netcore
@@ -178,6 +192,15 @@ stages:
           timeoutInMinutes: 90
           condition: eq(variables['System.TeamProject'], 'public')
 
+        - script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.csproj
+          displayName: Restore blob feed tasks
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+        - script: ./eng/common/msbuild.sh --ci $(Build.SourcesDirectory)/eng/publishwitharcade.proj /p:AzureFeedUrl=$(dotnetFeedUrl) /p:AzureAccountKey=$(dotnetfeed-storage-access-key-1) /p:AssetManifest=$(manifest)
+          displayName: Publish packages to blob feed
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+      ############ WINDOWS BUILD ############
       - job: Build_Windows
         displayName: Windows
         timeoutInMinutes: 90
@@ -185,6 +208,7 @@ stages:
           matrix:
             x64:
               poolname: Hosted VS2017
+              manifest: win-x64
         pool:
           name: $(poolname)
         steps:
@@ -204,12 +228,12 @@ stages:
             CHERE_INVOKING: yes
           displayName: 'Prepare Windows dependencies'
 
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-          - bash: |
-              sed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
-            env:
-              dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
-            displayName: 'Rewrite .gitmodules'
+        - bash: |
+            sed -i "s#git://github.com/#https://dn-bot:${dncengPat}@dev.azure.com/dnceng/internal/_git/#; s#\.git\$##; s#\(url = .*\)/\(.*\)#\1-\2#" .gitmodules
+          env:
+            dncengPat: $(dn-bot-dotnet-build-rw-code-rw)
+          displayName: 'Rewrite .gitmodules'
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')
 
         - script: |
             %CD:~0,2%\msys64\usr\bin\bash -lc "PATH=/usr/bin:/mingw64/bin:/c/hostedtoolcache/windows/dncs/2.2.203/x64:/c/Program\ Files/Git/bin ./autogen.sh --host=x86_64-w64-mingw32 --with-core=only"
@@ -222,6 +246,15 @@ stages:
           env:
             CHERE_INVOKING: yes
 
+        - powershell: eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.csproj
+          displayName: Restore blob feed tasks
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+        - powershell: eng\common\msbuild.ps1 -ci $(Build.SourcesDirectory)\eng\publishwitharcade.proj /p:AzureFeedUrl=$(dotnetFeedUrl) /p:AzureAccountKey=$(dotnetfeed-storage-access-key-1) /p:AssetManifest=$(manifest)
+          displayName: Publish packages to blob feed
+          condition: and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))
+
+
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
   - template: /eng/common/templates/post-build/post-build.yml
     parameters:
@@ -229,4 +262,3 @@ stages:
       enableSigningValidation: false
       enableSymbolValidation: false
       enableNugetValidation: true
-