diff --git a/src/Mono.Android.Export/Mono.Android.Export.csproj b/src/Mono.Android.Export/Mono.Android.Export.csproj
index f35e36d7691..accbd32026f 100644
--- a/src/Mono.Android.Export/Mono.Android.Export.csproj
+++ b/src/Mono.Android.Export/Mono.Android.Export.csproj
@@ -4,7 +4,7 @@
- monoandroid10;$(DotNetTargetFramework)
+ $(DotNetTargetFramework)
true
..\..\product.snk
true
@@ -12,62 +12,25 @@
true
true
false
+ $(_MonoAndroidNETDefaultOutDir)
$(NoWarn);CS0169;CS0414;CS0649
-
- MonoAndroid
- v1.0
- $(XAInstallPrefix)xbuild-frameworks
- $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\
-
-
-
- $(_MonoAndroidNETDefaultOutDir)
-
-
-
-
- $(OutputPath)..\v1.0\mscorlib.dll
- False
-
-
- $(OutputPath)..\v1.0\System.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Core.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Xml.dll
- False
-
-
- $(OutputPath)..\v1.0\Java.Interop.dll
- False
-
-
- $(OutputPath)..\v1.0\Facades\System.Runtime.dll
- False
-
-
-
-
-
+
+
-
+
$(BuildDependsOn);
_CopyToPackDirs;
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index e8d9769ae6d..da4e0f992fa 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -5,7 +5,7 @@
- monoandroid10;$(DotNetTargetFramework)
+ $(DotNetTargetFramework)
Android
true
..\..\product.snk
@@ -24,15 +24,7 @@
true
-
- MonoAndroid
- v1.0
- $(XAInstallPrefix)xbuild-frameworks
- $(DefineConstants);NET_2_0
- $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\
-
-
-
+
$(DefineConstants);ANDROID_UNSTABLE
$(_MonoAndroidNETDefaultOutDir)
@@ -55,50 +47,7 @@
$(DefineConstants);ENABLE_MARSHAL_METHODS
-
-
- $(OutputPath)..\v1.0\mscorlib.dll
- False
-
-
- $(OutputPath)..\v1.0\System.dll
- False
-
-
- $(OutputPath)..\v1.0\Facades\System.Collections.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Core.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Net.Http.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Runtime.Serialization.dll
- False
-
-
- $(OutputPath)..\v1.0\System.Xml.dll
- False
-
-
- $(OutputPath)..\v1.0\Java.Interop.dll
- False
-
-
- $(OutputPath)..\v1.0\Facades\System.Runtime.dll
- False
-
-
- $(OutputPath)..\v1.0\Facades\System.Drawing.Common.dll
- False
-
-
-
-
+
ILLink.LinkAttributes.xml
@@ -374,8 +323,7 @@
-
-
+
@@ -386,8 +334,7 @@
-
-
+
@@ -410,16 +357,11 @@
-
-
-
-
-
-
+
-
+
$(BuildDependsOn);
_ExportMsxDoc;
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index 5c19d33c6b7..9c0388fe7ba 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -21,36 +21,6 @@
<_ApiXmlLocation>..\..\bin\Build$(Configuration)\api\
-
-
-
- <_GlobalProperties>
- JavaInteropProfile=Net45;
- XAInstallPrefix=$(XAInstallPrefix);
-
-
-
-
-
-
-
-
-
-
-
-
- <_PackageVersion>$(ProductVersion)
- <_PackageVersionBuild>$(XAVersionCommitCount)
-
-
+
<_PackageVersion>$(AndroidPackVersion)
<_PackageVersionBuild>$(PackVersionCommitCount)
@@ -204,27 +170,9 @@
-
-
-
-
-
-
-
-
-
-
@@ -264,7 +212,7 @@
$(MicrosoftAndroidSdkOutDir)
false
$(DefineConstants);TRACE;HAVE_CECIL;MSBUILD;ANDROID_24
- ..\..\src\Mono.Android\obj\$(Configuration)\monoandroid10\android-$(AndroidLatestStablePlatformId)\mcw
+ ..\..\src\Mono.Android\obj\$(Configuration)\$(DotNetTargetFramework)\android-$(AndroidLatestStablePlatformId)\mcw
8632
false
..\..\product.snk