[xbuild] PCL targets needs to load MonoAndroid targets file from MSBuildExtensionsPath
authorJeffrey Stedfast <jeff@xamarin.com>
Mon, 22 Oct 2012 16:32:14 +0000 (12:32 -0400)
committerJeffrey Stedfast <jeff@xamarin.com>
Mon, 22 Oct 2012 16:34:28 +0000 (12:34 -0400)
Fixes bug #7905

mcs/tools/xbuild/xbuild/Microsoft.Portable.CSharp.targets

index 53535611234c39461b7da1b45380a13b8c964ac3..3aa2bed98f09849bcddc4f0b2029c3e484d9bf06 100644 (file)
        </PropertyGroup>
        
        <PropertyGroup Condition = "Exists ('/Developer/MonoAndroid/License.rtf') And !Exists ('/Developer/MonoTouch/License.rtf')">
-               <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+               <TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
                <CscToolPath>/Developer/MonoAndroid/usr/bin</CscToolPath>
                <CscToolExe>smcs</CscToolExe>
        </PropertyGroup>
        
-       <Import Project="$(MSBuildToolsPath)\Novell\Novell.MonoDroid.CSharp.targets" Condition = "Exists ('/Developer/MonoAndroid/License.rtf') And !Exists ('/Developer/MonoTouch/License.rtf')"/>
+       <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" Condition = "Exists ('/Developer/MonoAndroid/License.rtf') And !Exists ('/Developer/MonoTouch/License.rtf')"/>
        <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" Condition = "Exists ('/Developer/MonoTouch/License.rtf') Or !Exists ('/Developer/MonoAndroid/License.rtf')"/>
        
        <PropertyGroup>