From 3f48ad430fd047d0ef550efe4267bb838dff34ed Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 12 Sep 2022 09:59:17 -0700
Subject: [PATCH] Publish assets immediately - Avoid using another stage for
 publishing - Clean up unused YAML.

---
 .vsts-ci-richnav.yml |  8 --------
 .vsts-ci.yml         | 11 ++---------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml
index f38ac32151d6..577f4d51d088 100644
--- a/.vsts-ci-richnav.yml
+++ b/.vsts-ci-richnav.yml
@@ -10,14 +10,6 @@ pr: none
 variables:
   - name: teamName
     value: Roslyn-Project-System
-  - name: _DotNetPublishToBlobFeed
-    value: false
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: _DotNetValidationArtifactsCategory
-    value: .NETCore
-  - name: _PublishToAzure
-    value: false
   - name: PostBuildSign
     value: true
 
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9e86f66613ae..5890c1aadde7 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -2,7 +2,6 @@ trigger:
   batch: true
   branches:
     include:
-    - master
     - main
     - release/*
     - internal/release/3.*
@@ -16,12 +15,6 @@ trigger:
 variables:
   - name: teamName
     value: Roslyn-Project-System
-  - name: _DotNetPublishToBlobFeed
-    value: false
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: _DotNetValidationArtifactsCategory
-    value: .NETCore
   - name: PostBuildSign
     value: true
   - ${{ if eq(variables['System.TeamProject'], 'public') }}:
@@ -32,8 +25,6 @@ variables:
     - name: "skipComponentGovernanceDetection"
       value: "true"
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-    - name: _DotNetPublishToBlobFeed
-      value: true
     - name: _OfficialBuildArgs
       value: /p:OfficialBuilder=Microsoft
     - group: DotNetBuilds storage account read tokens
@@ -174,6 +165,7 @@ stages:
     - template: /eng/common/templates/job/publish-build-assets.yml
       parameters:
         publishUsingPipelines: true
+        publishAssetsImmediately: true
         dependsOn:
           - Windows_NT
           - Source_Build_Managed
@@ -189,6 +181,7 @@ stages:
       enableNugetValidation: false
       enableSourceLinkValidation: false
       publishInstallersAndChecksums: true
+      publishAssetsImmediately: true
       SDLValidationParameters:
         enable: false
         params: ' -SourceToolsList @("policheck","credscan")