Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build-tools/automation/azure-pipelines-apidocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ resources:
repositories:
- repository: 1esPipelines
type: git
name: 1ESPipelineTemplates/MicroBuildTemplate
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

parameters:
- name: apiLevel
Expand Down Expand Up @@ -100,8 +101,6 @@ extends:
submodules: recursive

- template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml@self
parameters:
useAgentJdkPath: false

# Set MSBuild property overrides if parameters are set
- ${{ if ne(parameters.apiLevel, 'default') }}:
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Android/Mono.Android.targets
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@

<PropertyGroup>
<!-- Override these properties to generate docs against a specific API level -->
<DocsApiLevel Condition=" '$(DocsApiLevel)' == '' ">36</DocsApiLevel>
<DocsApiLevel Condition=" '$(DocsApiLevel)' == '' ">$(AndroidApiLevel)</DocsApiLevel>
<DocsPlatformId Condition=" '$(DocsPlatformId)' == '' ">$(DocsApiLevel)</DocsPlatformId>
<DocsFxMoniker Condition=" '$(DocsFxMoniker)' == '' ">net-android-$(DocsApiLevel).0</DocsFxMoniker>
<DocsExportOutput Condition=" '$(DocsExportOutput)' == '' ">$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml</DocsExportOutput>
Expand Down