diff --git a/eng/build.yml b/eng/build.yml
index fd22d08e4..11d6e3cbd 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -98,18 +98,9 @@ phases:
                   $(_AdditionalBuildParameters)
         displayName: Build
 
-    - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
-      - task: NuGetCommand@2
-        displayName: 'Push Visual Studio NuPkgs'
-        inputs:
-          command: push
-          packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg'
-          nuGetFeedType: external
-          publishFeedCredentials: CrossTest
-
     - task: PublishTestResults@1	
       displayName: Publish Test Results	
-      inputs:	
+      inputs:
         testRunner: XUnit	
         testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'	
         testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'	
@@ -119,7 +110,7 @@ phases:
 
     - task: CopyFiles@2	
       displayName: Gather Logs	
-      inputs:	
+      inputs:
         SourceFolder: '$(Build.SourcesDirectory)/artifacts'	
         Contents: |	
          log/$(_BuildConfig)/**/*	
@@ -130,7 +121,7 @@ phases:
 
     - task: PublishBuildArtifacts@1	
       displayName: Publish Logs to VSTS	
-      inputs:	
+      inputs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)'	
         ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
         publishLocation: Container	
@@ -138,6 +129,14 @@ phases:
       condition: not(succeeded())
 
     - ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+      - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
+        - task: NuGetCommand@2
+          displayName: 'Push Visual Studio NuPkgs'
+          inputs:
+            command: push
+            packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg'
+            nuGetFeedType: external
+            publishFeedCredentials: CrossTest
       - task: CopyFiles@2
         displayName: Gather Asset Manifests
         inputs: