Skip to content

Commit efe6efa

Browse files
committed
[Mono.Android] Use 'merge.SourceFile' to set 'ApiSince'.
1 parent a017561 commit efe6efa

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

external/Java.Interop

src/Mono.Android/Mono.Android.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<_Fixup>--fixup=metadata</_Fixup>
109109
<_Enums1>--preserve-enums --enumflags=enumflags --enumfields=map.csv --enummethods=methodmap.csv</_Enums1>
110110
<_Enums2>--enummetadata=$(IntermediateOutputPath)mcw\enummetadata</_Enums2>
111-
<_Versions>@(_ApiVersion->'--apiversions="%(Identity)"', ' ')</_Versions>
112111
<_Annotations>--annotations="$(AndroidSdkDirectory)\platform-tools\api\annotations.zip"</_Annotations>
113112
<_Assembly>--assembly="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"</_Assembly>
114113
<_TypeMap>--type-map-report=$(IntermediateOutputPath)mcw\type-mapping.txt</_TypeMap>

src/Mono.Android/metadata

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
<attr api-since="1" api-until="18" path="/api/package/interface" name="deprecated"
99
>The assembly `Mono.Android.dll` for this API level will be removed in a future release. Please update your `$(TargetFrameworkVersion)` to be v4.4 or greater.</attr>
1010

11+
<!-- Set ApiSince based on merge sourcefile -->
12+
<attr api-since="10" path="/api/package//*[contains(@merge.SourceFile,'api-10.xml.in')]" name="api-since">10</attr>
13+
<attr api-since="15" path="/api/package//*[contains(@merge.SourceFile,'api-15.xml.in')]" name="api-since">15</attr>
14+
<attr api-since="16" path="/api/package//*[contains(@merge.SourceFile,'api-16.xml.in')]" name="api-since">16</attr>
15+
<attr api-since="17" path="/api/package//*[contains(@merge.SourceFile,'api-17.xml.in')]" name="api-since">17</attr>
16+
<attr api-since="18" path="/api/package//*[contains(@merge.SourceFile,'api-18.xml.in')]" name="api-since">18</attr>
17+
<attr api-since="19" path="/api/package//*[contains(@merge.SourceFile,'api-19.xml.in')]" name="api-since">19</attr>
18+
<attr api-since="20" path="/api/package//*[contains(@merge.SourceFile,'api-20.xml.in')]" name="api-since">20</attr>
19+
<attr api-since="21" path="/api/package//*[contains(@merge.SourceFile,'api-21.xml.in')]" name="api-since">21</attr>
20+
<attr api-since="22" path="/api/package//*[contains(@merge.SourceFile,'api-22.xml.in')]" name="api-since">22</attr>
21+
<attr api-since="23" path="/api/package//*[contains(@merge.SourceFile,'api-23.xml.in')]" name="api-since">23</attr>
22+
<attr api-since="24" path="/api/package//*[contains(@merge.SourceFile,'api-24.xml.in')]" name="api-since">24</attr>
23+
<attr api-since="25" path="/api/package//*[contains(@merge.SourceFile,'api-25.xml.in')]" name="api-since">25</attr>
24+
<attr api-since="26" path="/api/package//*[contains(@merge.SourceFile,'api-26.xml.in')]" name="api-since">26</attr>
25+
<attr api-since="27" path="/api/package//*[contains(@merge.SourceFile,'api-27.xml.in')]" name="api-since">27</attr>
26+
<attr api-since="28" path="/api/package//*[contains(@merge.SourceFile,'api-28.xml.in')]" name="api-since">28</attr>
27+
<attr api-since="29" path="/api/package//*[contains(@merge.SourceFile,'api-29.xml.in')]" name="api-since">29</attr>
28+
<attr api-since="30" path="/api/package//*[contains(@merge.SourceFile,'api-30.xml.in')]" name="api-since">30</attr>
29+
<attr api-since="30" path="/api/package//*[contains(@merge.SourceFile,'api-R.xml.in')]" name="api-since">30</attr>
30+
1131
<!-- FIXME: we should remove this fixup in the future release. It was
1232
introduced due to mismatching enum use, and we already marked the API as
1333
[Obsolete] -->

0 commit comments

Comments
 (0)