Skip to content

Commit

Permalink
[Xamarin.Android.Build.Tasks] Correct mono module file references.
Browse files Browse the repository at this point in the history 
Thanks to @joeabbey for reporting the oversight:

https://gitter.im/xamarin/xamarin-android?at=572262ecacbf59414aafeb42

> I had to make some modifications to
> Xamarin.Android.Build.Tasks.csproj
> As far as I could tell, basically the ......\mono\mcs Includes
> needed to be ....\external\mono

That was an oversight on our part, as $topdir/../mono is a valid path
on our build machines...

Oops.
  • Loading branch information
@jonpryor
jonpryor committed Apr 28, 2016
1 parent b7ae30a commit 54ef952
Showing 1 changed file with 71 additions and 71 deletions.
142 changes: 71 additions & 71 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@
<Compile Include="Linker\MonoDroid.Tuner\RemoveAttributes.cs" />
<Compile Include="Utilities\MSBuildExtensions.cs" />
<Compile Include="Mono.Android\ServiceAttribute.Partial.cs" />
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\AdjustVisibility.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\AdjustVisibility.cs">
<Link>Linker\Mono.Tuner\AdjustVisibility.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\CecilRocks.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\CecilRocks.cs">
<Link>Linker\Mono.Tuner\CecilRocks.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\CheckVisibility.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\CheckVisibility.cs">
<Link>Linker\Mono.Tuner\CheckVisibility.cs</Link>
</Compile>
<Compile Include="Mono.Android\UsesLibraryAttribute.Partial.cs" />
Expand Down Expand Up @@ -220,82 +220,82 @@
<Compile Include="Tasks\CreateMultiDexMainDexClassList.cs" />
<Compile Include="Tasks\ReadAdditionalResourcesFromAssemblyCache.cs" />
<Compile Include="Tasks\JavaToolTask.cs" />
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\BitAccess.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\BitAccess.cs">
<Link>pdb2mdb\BitAccess.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\BitSet.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\BitSet.cs">
<Link>pdb2mdb\BitSet.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\CvInfo.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\CvInfo.cs">
<Link>pdb2mdb\CvInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\DataStream.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\DataStream.cs">
<Link>pdb2mdb\DataStream.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\DbiDbgHdr.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\DbiDbgHdr.cs">
<Link>pdb2mdb\DbiDbgHdr.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\DbiHeader.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\DbiHeader.cs">
<Link>pdb2mdb\DbiHeader.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\DbiModuleInfo.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\DbiModuleInfo.cs">
<Link>pdb2mdb\DbiModuleInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\DbiSecCon.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\DbiSecCon.cs">
<Link>pdb2mdb\DbiSecCon.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\Driver.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\Driver.cs">
<Link>pdb2mdb\Driver.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\IntHashTable.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\IntHashTable.cs">
<Link>pdb2mdb\IntHashTable.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\Interfaces.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\Interfaces.cs">
<Link>pdb2mdb\Interfaces.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\MsfDirectory.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\MsfDirectory.cs">
<Link>pdb2mdb\MsfDirectory.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbConstant.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbConstant.cs">
<Link>pdb2mdb\PdbConstant.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbDebugException.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbDebugException.cs">
<Link>pdb2mdb\PdbDebugException.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbException.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbException.cs">
<Link>pdb2mdb\PdbException.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbFile.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbFile.cs">
<Link>pdb2mdb\PdbFile.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbFileHeader.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbFileHeader.cs">
<Link>pdb2mdb\PdbFileHeader.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbFunction.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbFunction.cs">
<Link>pdb2mdb\PdbFunction.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbLine.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbLine.cs">
<Link>pdb2mdb\PdbLine.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbLines.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbLines.cs">
<Link>pdb2mdb\PdbLines.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbReader.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbReader.cs">
<Link>pdb2mdb\PdbReader.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbScope.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbScope.cs">
<Link>pdb2mdb\PdbScope.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbSlot.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbSlot.cs">
<Link>pdb2mdb\PdbSlot.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbSource.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbSource.cs">
<Link>pdb2mdb\PdbSource.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\PdbWriter.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\PdbWriter.cs">
<Link>pdb2mdb\PdbWriter.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\pdb2mdb\SourceLocationProvider.cs">
<Compile Include="..\..\external\mono\mcs\tools\pdb2mdb\SourceLocationProvider.cs">
<Link>pdb2mdb\SourceLocationProvider.cs</Link>
</Compile>
<Compile Include="Tasks\Lint.cs" />
Expand All @@ -308,79 +308,79 @@
<None Include="Xamarin.Android.Analysis.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\Annotations.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\Annotations.cs">
<Link>Linker\Mono.Linker\Annotations.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\AssemblyAction.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\AssemblyAction.cs">
<Link>Linker\Mono.Linker\AssemblyAction.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\AssemblyResolver.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\AssemblyResolver.cs">
<Link>Linker\Mono.Linker\AssemblyResolver.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\I18nAssemblies.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\I18nAssemblies.cs">
<Link>Linker\Mono.Linker\I18nAssemblies.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\IXApiVisitor.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\IXApiVisitor.cs">
<Link>Linker\Mono.Linker\IXApiVisitor.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\LinkContext.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\LinkContext.cs">
<Link>Linker\Mono.Linker\LinkContext.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\MethodAction.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\MethodAction.cs">
<Link>Linker\Mono.Linker\MethodAction.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\Pipeline.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\Pipeline.cs">
<Link>Linker\Mono.Linker\Pipeline.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\TypePreserve.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\TypePreserve.cs">
<Link>Linker\Mono.Linker\TypePreserve.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker\XApiReader.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker\XApiReader.cs">
<Link>Linker\Mono.Linker\XApiReader.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\BlacklistStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\BlacklistStep.cs">
<Link>Linker\Mono.Linker.Steps\BlacklistStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\BaseStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\BaseStep.cs">
<Link>Linker\Mono.Linker.Steps\BaseStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\CleanStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\CleanStep.cs">
<Link>Linker\Mono.Linker.Steps\CleanStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\IStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\IStep.cs">
<Link>Linker\Mono.Linker.Steps\IStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\LoadI18nAssemblies.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\LoadI18nAssemblies.cs">
<Link>Linker\Mono.Linker.Steps\LoadI18nAssemblies.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\LoadReferencesStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\LoadReferencesStep.cs">
<Link>Linker\Mono.Linker.Steps\LoadReferencesStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\OutputStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\OutputStep.cs">
<Link>Linker\Mono.Linker.Steps\OutputStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\RegenerateGuidStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\RegenerateGuidStep.cs">
<Link>Linker\Mono.Linker.Steps\RegenerateGuidStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromXApiStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromXApiStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromXApiStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromXmlStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveFromXmlStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveFromXmlStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\ResolveStep.cs">
<Link>Linker\Mono.Linker.Steps\ResolveStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\TypeMapStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\TypeMapStep.cs">
<Link>Linker\Mono.Linker.Steps\TypeMapStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\SweepStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\SweepStep.cs">
<Link>Linker\Mono.Linker.Steps\SweepStep.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\linker\Mono.Linker.Steps\MarkStep.cs">
<Compile Include="..\..\external\mono\mcs\tools\linker\Mono.Linker.Steps\MarkStep.cs">
<Link>Linker\Mono.Linker.Steps\MarkStep.cs</Link>
</Compile>
<Compile Include="Tasks\MergeResources.cs" />
Expand All @@ -405,40 +405,40 @@
<Compile Include="Utilities\Files.cs">
<Link>Utilities\Files.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
<Link>Linker\Mono.Tuner\ApplyPreserveAttributeBase.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\Dispatcher.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\Dispatcher.cs">
<Link>Linker\Mono.Tuner\Dispatcher.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\CustomizeActions.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\CustomizeActions.cs">
<Link>Linker\Mono.Tuner\CustomizeActions.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\Extensions.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\Extensions.cs">
<Link>Linker\Mono.Tuner\Extensions.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\FixModuleFlags.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\FixModuleFlags.cs">
<Link>Linker\Mono.Tuner\FixModuleFlags.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\PrintTypeMap.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\PrintTypeMap.cs">
<Link>Linker\Mono.Tuner\PrintTypeMap.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\PreserveCrypto.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\PreserveCrypto.cs">
<Link>Linker\Mono.Tuner\PreserveCrypto.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
<Link>Linker\Mono.Tuner\PreserveSoapHttpClients.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\Profile.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\Profile.cs">
<Link>Linker\Mono.Tuner\Profile.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\RemoveAttributesBase.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\RemoveAttributesBase.cs">
<Link>Linker\Mono.Tuner\RemoveAttributesBase.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\RemoveResources.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\RemoveResources.cs">
<Link>Linker\Mono.Tuner\RemoveResources.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\RemoveSecurity.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\RemoveSecurity.cs">
<Link>Linker\Mono.Tuner\RemoveSecurity.cs</Link>
</Compile>
<Compile Include="..\Mono.Android\\Android.App\IntentFilterAttribute.cs">
Expand Down Expand Up @@ -477,19 +477,19 @@
<Compile Include="..\..\external\Java.Interop\src\utils\StringRocks.cs">
<Link>Utilities\StringRocks.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\FilterAttributes.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\FilterAttributes.cs">
<Link>Linker\Mono.Tuner\FilterAttributes.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\InjectSecurityAttributes.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\InjectSecurityAttributes.cs">
<Link>Linker\Mono.Tuner\InjectSecurityAttributes.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\PrintStatus.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\PrintStatus.cs">
<Link>Linker\Mono.Tuner\PrintStatus.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\RemoveSerialization.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\RemoveSerialization.cs">
<Link>Linker\Mono.Tuner\RemoveSerialization.cs</Link>
</Compile>
<Compile Include="..\..\..\mono\mcs\tools\tuner\Mono.Tuner\TunerAnnotations.cs">
<Compile Include="..\..\external\mono\mcs\tools\tuner\Mono.Tuner\TunerAnnotations.cs">
<Link>Linker\Mono.Tuner\TunerAnnotations.cs</Link>
</Compile>
<Compile Include="..\Mono.Android\\Android.App\UsesLibraryAttribute.cs">
Expand Down

0 comments on commit 54ef952

Please sign in to comment.