Skip to content

Commit 0114586

Browse files
jonathanpeppersjonpryor
authored andcommitted
[build] fix api-xml-adjuster.targets on Windows (#1291)
Since 7d705bf, the Windows builds on VSTS have seemed to be failing. I tested this locally, and noticed the use of command line arguments such as: -parameter-names='%(SomeVariable)' Unfortunately, this isn't working on Windows due to the single quote. It is more appropriately expressed as: -parameter-names="%(SomeVariable)" This isn't very pretty, but it should work on all platforms. I also fixed all the tabs I saw in this file--in favor of spaces, and fixed other XML code conventions. I will now return to my regularly scheduled baby duty.
1 parent 7c31899 commit 0114586

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

build-tools/api-xml-adjuster/api-xml-adjuster.targets

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
</PropertyGroup>
99

1010
<Target Name="_DefineApiFiles">
11-
<CreateItem Include="@(AndroidApiInfo)"
12-
AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(AndroidApiInfo.Level).params.txt;ClassParseXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.in"
13-
>
14-
<Output TaskParameter="Include" ItemName="ApiFileDefinition"/>
15-
</CreateItem>
11+
<CreateItem Include="@(AndroidApiInfo)"
12+
AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(AndroidApiInfo.Level).params.txt;ClassParseXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.in">
13+
<Output TaskParameter="Include" ItemName="ApiFileDefinition"/>
14+
</CreateItem>
1615
</Target>
1716

1817
<Target Name="_ClassParse"
@@ -25,8 +24,8 @@
2524
</PropertyGroup>
2625
<MakeDir Directories="$(_OutputPath)api" />
2726
<Exec
28-
Condition="Exists('$(_TopDir)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Level).params.txt')"
29-
Command="$(ManagedRuntime) $(ClassParse) $(AndroidSdkDirectory)\platforms\android-%(ApiFileDefinition.Level)\android.jar -platform=%(ApiFileDefinition.Level) -parameter-names='%(ApiFileDefinition.ParameterDescription)' -o='%(ApiFileDefinition.ClassParseXml)'"
27+
Condition="Exists('$(_TopDir)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Level).params.txt')"
28+
Command="$(ManagedRuntime) $(ClassParse) $(AndroidSdkDirectory)\platforms\android-%(ApiFileDefinition.Level)\android.jar -platform=%(ApiFileDefinition.Level) -parameter-names=&quot;%(ApiFileDefinition.ParameterDescription)&quot; -o=&quot;%(ApiFileDefinition.ClassParseXml)&quot;"
3029
/>
3130
</Target>
3231
<Target Name="_AdjustApiXml"
@@ -38,13 +37,13 @@
3837
<ApiXmlAdjuster>$(_TopDir)\bin\Build$(Configuration)\api-xml-adjuster.exe</ApiXmlAdjuster>
3938
</PropertyGroup>
4039
<Exec
41-
Condition="Exists('$(_TopDir)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Level).params.txt')"
40+
Condition="Exists('$(_TopDir)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Level).params.txt')"
4241
Command="$(ManagedRuntime) $(ApiXmlAdjuster) %(ApiFileDefinition.ClassParseXml) %(ApiFileDefinition.ApiAdjustedXml)"
4342
/>
4443
</Target>
4544

4645
<Target Name="_CleanApiXml"
47-
BeforeTargets="Clean">
46+
BeforeTargets="Clean">
4847

4948
<Delete Files="%(ApiFileDefinition.ApiAdjustedXml)" />
5049
<Delete Files="%(ApiFileDefinition.ClassParseXml)" />

0 commit comments

Comments
 (0)