diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
index 56ce9998fa1..6a5bb66fd0f 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
@@ -21,7 +21,6 @@ Copyright (C) 2016 Xamarin. All rights reserved.
-
False
<_DesignerIntermediateOutputPath Condition="'$(_OuterIntermediateOutputPath)' != '' ">$(_OuterIntermediateOutputPath)
<_DesignerIntermediateOutputPath Condition="'$(_DesignerIntermediateOutputPath)' == '' ">$(IntermediateOutputPath)
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
index 2406c4a0a5b..a3b9ad00ec3 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -10,8 +10,10 @@
true
Xamarin.Android.Net.AndroidMessageHandler
Xamarin.Android.Net.AndroidClientHandler
+ false
+ false
true
- $(AndroidGenerateResourceDesigner)
+ $(AndroidGenerateResourceDesigner)
false
false
false
@@ -92,9 +94,9 @@
false
false
true
- <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true
+ <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true
false
- false
+ false
true
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerAssembly.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerAssembly.cs
index c2d3a00df29..ba5fa70d8e0 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerAssembly.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerAssembly.cs
@@ -127,10 +127,6 @@ bool Run(DirectoryAssemblyResolver res) {
if (File.Exists (RTxtFile.ItemSpec))
ProcessRtxtFile (RTxtFile.ItemSpec, resourceDesigner, module);
- // var mscorlib = module.AssemblyReferences.FirstOrDefault(x => x.Name == "mscorlib");
- // if (mscorlib != null)
- // module.AssemblyReferences.Remove(mscorlib);
-
assembly.Write (OutputFile.ItemSpec);
return !Log.HasLoggedErrors;
}
@@ -220,7 +216,7 @@ void CreateCtor (TypeDefinition type, ModuleDefinition module)
ctoril.Emit(OpCodes.Ldarg_0);
var o = module.TypeSystem.Object.Resolve();
ctoril.Emit(OpCodes.Call, module.ImportReference(o.Methods.First(x => x.IsConstructor)));
- ctoril.Emit(OpCodes.Nop);
+ //ctoril.Emit(OpCodes.Nop);
ctoril.Emit(OpCodes.Ret);
type.Methods.Add(ctor);
}