Merge pull request dotnet#19546 from brianaeng/breng/fixRichNavYml

Update rich nav yml
Keboo · Aug 9, 2021 · 6820fa9 · 6820fa9
2 parents 11fdac0 + 8900183
commit 6820fa9
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 15 deletions.
diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml
@@ -5,6 +5,8 @@ trigger:
       - main
       - release/*.*
 
+pr: none
+
 variables:
   - name: teamName
     value: Roslyn-Project-System
@@ -23,25 +25,65 @@ stages:
 - stage: build
   displayName: Build
   jobs:
-    - template: /eng/build.yml
+    - template: /eng/common/templates/job/job.yml
       parameters:
+        name: Windows_NT_FullFramework
         enableRichCodeNavigation: true
         richCodeNavigationLanguage: 'csharp'
         richCodeNavigationEnvironment: 'production'
-        agentOs: Windows_NT_FullFramework
         pool:
             name: NetCorePublic-Pool
-            queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
-          helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
+            queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open  
+        timeoutInMinutes: 180
         strategy:
           matrix:
             Build_Debug:
               _BuildConfig: Debug
               _PublishType: none
               _SignType: test
               _Test: -test
-            Build_Release:
-              _BuildConfig: Release
-              _PublishType: none
-              _SignType: test
-              _Test: -test
+        workspace:
+          clean: all
+        variables:
+          - _AgentOSName: Windows_NT_FullFramework
+          - _TeamName: DotNetCore
+          - _OfficialBuildIdArgs: ''
+          - _PublishArgs: ''
+          - _SignArgs: ''
+          - _InternalRuntimeDownloadArgs: ''
+        steps:
+        - script: eng\CIBuild.cmd
+                    -configuration $(_BuildConfig)
+                    $(_PublishArgs)
+                    $(_SignArgs)
+                    $(_OfficialBuildIdArgs)
+                    $(_InternalRuntimeDownloadArgs)
+                    /p:Test=false
+          displayName: Build
+          env:
+            BuildConfig: $(_BuildConfig)
+            BlobFeedUrl: $(PB_PublishBlobFeedUrl)
+            PublishType: $(_PublishType)
+            TestFullMSBuild: 'true'
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+        - task: CopyFiles@2	
+          displayName: Gather Logs	
+          inputs:	
+            SourceFolder: '$(Build.SourcesDirectory)/artifacts'	
+            Contents: |	
+              log/$(_BuildConfig)/**/*	
+              TestResults/$(_BuildConfig)/**/*	
+              SymStore/$(_BuildConfig)/**/* 
+            TargetFolder: '$(Build.ArtifactStagingDirectory)'	
+          continueOnError: true	
+          condition: always()
+
+        - task: PublishBuildArtifacts@1	
+          displayName: Publish Logs to VSTS	
+          inputs:	
+            PathtoPublish: '$(Build.ArtifactStagingDirectory)'	
+            ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
+            publishLocation: Container	
+          continueOnError: true	
+          condition: always()
diff --git a/eng/build.yml b/eng/build.yml
@@ -1,9 +1,6 @@
 parameters:
   # Agent OS identifier and used as job name
   agentOs: ''
-  enableRichCodeNavigation: false
-  richCodeNavigationLanguage: 'csharp'
-  richCodeNavigationEnvironment: 'production'
 
   # Agent pool
   pool: {}
@@ -27,9 +24,6 @@ jobs:
 - template: /eng/common/templates/job/job.yml
   parameters:
     name: ${{ parameters.agentOs }}
-    enableRichCodeNavigation: ${{ parameters.enableRichCodeNavigation }}
-    richCodeNavigationLanguage: ${{ parameters.richCodeNavigationLanguage }}
-    richCodeNavigationEnvironment: ${{ parameters.richCodeNavigationEnvironment }}
     enableMicrobuild: true
     enablePublishBuildAssets: true
     enableTelemetry: true