Skip to content

Change Namespace to _Microsoft.Android.Resource.Designer #7681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 18, 2023
Merged

Change Namespace to _Microsoft.Android.Resource.Designer #7681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27b6f62
Change Namespace to _Microsoft.Android.Resource.Designer
dellis1972 Jan 10, 2023
ea1fa2e
Put partial back
dellis1972 Jan 11, 2023
9fa5836
Add a more '.net' looking auto genereted comment
dellis1972 Jan 12, 2023
6df459f
Disable IDE0002 Simplify member access warning
dellis1972 Jan 12, 2023
8c4c56b
Add System.ComponentModel.EditorBrowsableAttribute
dellis1972 Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixLegacyResourceDesignerStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace MonoDroid.Tuner
public class FixLegacyResourceDesignerStep : LinkDesignerBase
{
internal const string DesignerAssemblyName = "_Microsoft.Android.Resource.Designer";
internal const string DesignerAssemblyNamespace = "Microsoft.Android.Resource.Designer";
internal const string DesignerAssemblyNamespace = "_Microsoft.Android.Resource.Designer";

bool designerLoaded = false;
AssemblyDefinition designerAssembly = null;
Expand Down
20 changes: 16 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,25 @@ bool Run(DirectoryAssemblyResolver res)
} else {
// Add the InternalsVisibleToAttribute so the app can access ResourceConstant
if (!string.IsNullOrEmpty (AssemblyName)) {
MethodReference internalsVisibleToAttributeConstructor = ImportCustomAttributeConstructor ("System.Runtime.CompilerServices.InternalsVisibleToAttribute", module, netstandardDef.MainModule);
MethodReference internalsVisibleToAttributeConstructor = ImportCustomAttributeConstructor ("System.Runtime.CompilerServices.InternalsVisibleToAttribute", module, netstandardDef.MainModule, argCount: 1);
var ar = new CustomAttribute (internalsVisibleToAttributeConstructor);
ar.ConstructorArguments.Add (new CustomAttributeArgument (module.TypeSystem.String, AssemblyName));
module.Assembly.CustomAttributes.Add (ar);
}
}

MethodReference targetFrameworkConstructor = ImportCustomAttributeConstructor ("System.Runtime.Versioning.TargetFrameworkAttribute", module, netstandardDef.MainModule);
MethodReference targetFrameworkConstructor = ImportCustomAttributeConstructor ("System.Runtime.Versioning.TargetFrameworkAttribute", module, netstandardDef.MainModule, argCount: 1);

var attr = new CustomAttribute (targetFrameworkConstructor);
attr.ConstructorArguments.Add (new CustomAttributeArgument (module.TypeSystem.String, $".NETStandard,Version=v2.1"));
attr.Properties.Add (new CustomAttributeNamedArgument ("FrameworkDisplayName", new CustomAttributeArgument (module.TypeSystem.String, "")));
module.Assembly.CustomAttributes.Add (attr);

MethodReference editorBrowserConstructor = ImportCustomAttributeConstructor ("System.ComponentModel.EditorBrowsableAttribute", module, netstandardDef.MainModule, argCount: 1);
TypeReference e = ImportType ("System.ComponentModel.EditorBrowsableState", module, netstandardDef.MainModule);
var editorBrowserAttr = new CustomAttribute (editorBrowserConstructor);
editorBrowserAttr.ConstructorArguments.Add (new CustomAttributeArgument (e, System.ComponentModel.EditorBrowsableState.Never));

var att = TypeAttributes.AutoClass | TypeAttributes.AnsiClass | TypeAttributes.Public | TypeAttributes.BeforeFieldInit;

intArray = new ArrayType (module.TypeSystem.Int32);
Expand All @@ -131,6 +136,7 @@ bool Run(DirectoryAssemblyResolver res)
objectRef
);
CreateCtor (resourceDesigner, module);
resourceDesigner.CustomAttributes.Add (editorBrowserAttr);
module.Types.Add (resourceDesigner);
TypeDefinition constDesigner = null;
if (IsApplication) {
Expand All @@ -143,6 +149,7 @@ bool Run(DirectoryAssemblyResolver res)
objectRef
);
CreateCtor (constDesigner, module);
constDesigner.CustomAttributes.Add (editorBrowserAttr);
module.Types.Add (constDesigner);
}

Expand Down Expand Up @@ -196,11 +203,16 @@ bool Run(DirectoryAssemblyResolver res)
return !Log.HasLoggedErrors;
}

MethodReference ImportCustomAttributeConstructor (string type, ModuleDefinition module, ModuleDefinition sourceModule = null)
MethodReference ImportCustomAttributeConstructor (string type, ModuleDefinition module, ModuleDefinition sourceModule = null, int argCount = 0)
{
var tr = module.ImportReference ((sourceModule ?? module).ExportedTypes.First(x => x.FullName == type).Resolve ());
var tv = tr.Resolve();
return module.ImportReference (tv.Methods.First(x => x.IsConstructor));
return module.ImportReference (tv.Methods.First(x => x.IsConstructor && (x.Parameters?.Count ?? 0) == argCount));
}

TypeReference ImportType (string type, ModuleDefinition module, ModuleDefinition sourceModule = null)
{
return module.ImportReference ((sourceModule ?? module).ExportedTypes.First(x => x.FullName == type).Resolve ());
}

void CreateIntProperty (string resourceClass, string propertyName, int value, TypeDefinition resourceDesigner, ModuleDefinition module,
Expand Down
14 changes: 12 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerIntermediateClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,25 @@ public class GenerateResourceDesignerIntermediateClass : AndroidTask
private const string ResourceDesigner = $"{FixLegacyResourceDesignerStep.DesignerAssemblyNamespace}.Resource";
private const string ResourceDesignerConstants = $"{FixLegacyResourceDesignerStep.DesignerAssemblyNamespace}.ResourceConstant";

private const string CSharpTemplate = @"// This is an Auto Generated file DO NOT EDIT
private const string CSharpTemplate = @"//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool. DO NOT EDIT
// </auto-generated>
//------------------------------------------------------------------------------
using System;

namespace %NAMESPACE% {
#pragma warning disable IDE0002
public partial class Resource : %BASECLASS% {
}
#pragma warning restore IDE0002
}
";
private const string FSharpTemplate = @"// This is an Auto Generated file DO NOT EDIT
private const string FSharpTemplate = @"//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool. DO NOT EDIT
// </auto-generated>
//------------------------------------------------------------------------------
namespace %NAMESPACE%

type Resource = %BASECLASS%
Expand Down