Skip to content

Commit

Permalink
Replace RichNav with Code Index (dotnet#82088)
Browse files Browse the repository at this point in the history
RichNav is now known as Code Index: https://dev.azure.com/devdiv/DevDiv/_wiki/wikis/DevDiv.wiki/28554/Index-Your-Repo

The separate AzDO feed in nuget.config is not needed anymore which should make restore a bit faster.

Note that there's currently an error due to new MSBuild binlog version which is tracked by https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1746670/, so we decided to disable the pipeline for now.
  • Loading branch information
akoeplinger authored Feb 23, 2023
1 parent af18fd0 commit 310314d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 39 deletions.
2 changes: 0 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
14 changes: 1 addition & 13 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ parameters:
testResultsFormat: ''
extraStepsTemplate: ''
extraStepsParameters: {}
enableRichCodeNavigation: false
richCodeNavigationLanguage: 'csharp'
richCodeNavigationEnvironment: 'production'
isManualCodeQLBuild: false

jobs:
Expand All @@ -56,9 +53,6 @@ jobs:

workspace:
clean: all
enableRichCodeNavigation: ${{ parameters.enableRichCodeNavigation }}
richCodeNavigationLanguage: ${{ parameters.richCodeNavigationLanguage }}
richCodeNavigationEnvironment: ${{ parameters.richCodeNavigationEnvironment }}

${{ if and(ne(parameters.dependOnEvaluatePaths, true),ne(parameters.dependsOn,'')) }}:
dependsOn: ${{ parameters.dependsOn }}
Expand Down Expand Up @@ -107,12 +101,6 @@ jobs:
${{ if notin(parameters.osGroup, 'ios', 'tvos', 'maccatalyst')}}:
value: ''

- name: _richCodeNavigationParam
${{ if eq(parameters.enableRichCodeNavigation, true) }}:
value: /p:EnableRichCodeNavigation=true
${{ if ne(parameters.enableRichCodeNavigation, true) }}:
value: ''

- name: _sclEnableCommand
${{ if eq(parameters.isSourceBuild, true) }}:
value: scl enable llvm-toolset-7.0 --
Expand Down Expand Up @@ -184,7 +172,7 @@ jobs:
- task: CodeQL3000Init@0
displayName: Initialize CodeQL (manually-injected)

- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
displayName: Build product
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
continueOnError: ${{ parameters.shouldContinueOnError }}
Expand Down
49 changes: 25 additions & 24 deletions eng/pipelines/runtime-richnav.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
trigger:
batch: true
branches:
include:
- main
- release/*.*
paths:
include:
- '*'
exclude:
- '**.md'
- eng/Version.Details.xml
- .devcontainer/*
- .github/*
- docs/*
- LICENSE.TXT
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT
# disabled until https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1746670 is fixed
trigger: none

# trigger:
# batch: true
# branches:
# include:
# - main
# - release/*.*
# paths:
# include:
# - '*'
# exclude:
# - '**.md'
# - eng/Version.Details.xml
# - .devcontainer/*
# - .github/*
# - docs/*
# - LICENSE.TXT
# - PATENTS.TXT
# - THIRD-PARTY-NOTICES.TXT

pr: none

variables:
- template: /eng/pipelines/common/variables.yml
- name: CodeIndex.Enabled
value: true
- name: CodeIndex.Languages
value: csharp,cpp

extends:
template: /eng/pipelines/common/templates/pipeline-with-resources.yml
Expand All @@ -36,9 +43,6 @@ extends:
platforms:
- windows_x64
jobParameters:
enableRichCodeNavigation: true
richCodeNavigationEnvironment: "production"
richCodeNavigationLanguage: "csharp"
timeoutInMinutes: 240
buildArgs: -s libs.sfx+libs.oob -allConfigurations

Expand All @@ -49,8 +53,5 @@ extends:
platforms:
- windows_x64
jobParameters:
enableRichCodeNavigation: true
nameSuffix: Mono
richCodeNavigationEnvironment: "production"
richCodeNavigationLanguage: "csharp,cpp"
buildArgs: -s mono -c debug

0 comments on commit 310314d

Please sign in to comment.