Skip to content

Clean up 'GetTypeInfo()' calls in 'help', 'cimSupport' and 'DscSupport' folders #6633

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
daxian-dbw merged 1 commit into from
Apr 13, 2018
Merged

Clean up 'GetTypeInfo()' calls in 'help', 'cimSupport' and 'DscSupport' folders #6633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/System.Management.Automation/DscSupport/CimDSCParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ private static void GenerateMofForAst(TypeDefinitionAst typeAst, StringBuilder s
if (type != null)
{
ProcessMembers(type, sb, embeddedInstanceTypes, className);
var t = type.GetTypeInfo().BaseType;
var t = type.BaseType;
if (t != null)
{
bases.Enqueue(t);
Expand Down Expand Up @@ -2436,7 +2436,7 @@ private static void ProcessMembers(StringBuilder sb, List<object> embeddedInstan
mofType = MapTypeToMofType(memberType, member.Name, className, out isArrayType,
out embeddedInstanceType,
embeddedInstanceTypes);
if (memberType.GetTypeInfo().IsEnum)
if (memberType.IsEnum)
{
enumNames = Enum.GetNames(memberType);
}
Expand Down Expand Up @@ -2707,12 +2707,12 @@ private static bool IsSameNestedObject(CimClass oldClass, CimClass newClass)
internal static string MapTypeToMofType(Type type, String memberName, String className, out bool isArrayType, out string embeddedInstanceType, List<object> embeddedInstanceTypes)
{
isArrayType = false;
if (type.GetTypeInfo().IsValueType)
if (type.IsValueType)
{
type = Nullable.GetUnderlyingType(type) ?? type;
}

if (type.GetTypeInfo().IsEnum)
if (type.IsEnum)
{
embeddedInstanceType = null;
return "string";
Expand Down Expand Up @@ -2754,21 +2754,21 @@ internal static string MapTypeToMofType(Type type, String memberName, String cla

bool supported = false;
bool missingDefaultConstructor = false;
if (type.GetTypeInfo().IsValueType)
if (type.IsValueType)
{
if (s_mapPrimitiveDotNetTypeToMof.ContainsKey(type))
{
supported = true;
}
}
else if (!type.GetTypeInfo().IsAbstract)
else if (!type.IsAbstract)
{
// Must have default constructor, at least 1 public property/field, and no base classes
if (type.GetConstructor(PSTypeExtensions.EmptyTypes) == null)
{
missingDefaultConstructor = true;
}
else if (type.GetTypeInfo().BaseType == typeof(object) &&
else if (type.BaseType == typeof(object) &&
(type.GetProperties(BindingFlags.Instance | BindingFlags.Public).Length > 0 ||
type.GetFields(BindingFlags.Instance | BindingFlags.Public).Length > 0))
{
Expand Down Expand Up @@ -2950,7 +2950,7 @@ private static void GenerateMofForType(Type type, StringBuilder sb, List<object>
// Friendly name is required by module validator to verify resource instance against the exclusive resource name list.
sb.AppendFormat(CultureInfo.InvariantCulture, "[ClassVersion(\"1.0.0\"), FriendlyName(\"{0}\")]\nclass {0}", className);

if (type.GetTypeInfo().GetCustomAttributes<DscResourceAttribute>().Any())
if (type.GetCustomAttributes<DscResourceAttribute>().Any())
{
sb.Append(" : OMI_BaseResource");
}
Expand Down Expand Up @@ -2992,7 +2992,7 @@ private static void ProcessMembers(Type type, StringBuilder sb, List<object> emb
embeddedInstanceTypes);
string arrayAffix = isArrayType ? "[]" : String.Empty;

var enumNames = memberType.GetTypeInfo().IsEnum
var enumNames = memberType.IsEnum
? Enum.GetNames(memberType)
: null;
sb.AppendFormat(CultureInfo.InvariantCulture,
Expand All @@ -3015,7 +3015,7 @@ private static bool ImportKeywordsFromAssembly(PSModuleInfo module,
var parser = new Microsoft.PowerShell.DesiredStateConfiguration.CimDSCParser(MyClassCallback);

IEnumerable<Type> resourceDefinitions =
assembly.GetTypes().Where(t => t.GetTypeInfo().GetCustomAttributes<DscResourceAttribute>().Any());
assembly.GetTypes().Where(t => t.GetCustomAttributes<DscResourceAttribute>().Any());

foreach (var r in resourceDefinitions)
{
Expand Down
9 changes: 3 additions & 6 deletions src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ internal ScriptWriter(

string objectModelWrapperName = _cmdletizationMetadata.Class.CmdletAdapter ?? defaultObjectModelWrapper;
_objectModelWrapper = (Type)LanguagePrimitives.ConvertTo(objectModelWrapperName, typeof(Type), CultureInfo.InvariantCulture);
TypeInfo objectModelWrapperTypeInfo = _objectModelWrapper.GetTypeInfo();
if (objectModelWrapperTypeInfo.IsGenericType)
if (_objectModelWrapper.IsGenericType)
{
string message = string.Format(
CultureInfo.CurrentCulture,
Expand All @@ -141,10 +140,9 @@ internal ScriptWriter(
throw new XmlException(message);
}
Type baseType = _objectModelWrapper;
TypeInfo baseTypeInfo = objectModelWrapperTypeInfo;
while ((!baseTypeInfo.IsGenericType) || baseTypeInfo.GetGenericTypeDefinition() != typeof(CmdletAdapter<>))
while ((!baseType.IsGenericType) || baseType.GetGenericTypeDefinition() != typeof(CmdletAdapter<>))
{
baseType = baseTypeInfo.BaseType;
baseType = baseType.BaseType;
if (baseType == typeof(object))
{
string message = string.Format(
Expand All @@ -154,7 +152,6 @@ internal ScriptWriter(
typeof(CmdletAdapter<>).FullName);
throw new XmlException(message);
}
baseTypeInfo = baseType.GetTypeInfo();
}
_objectInstanceType = baseType.GetGenericArguments()[0];

Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public override Collection<string> GetTypeNameHierarchy(object baseObject)

if (baseObject != null)
{
for (Type type = baseObject.GetType(); type != null; type = type.GetTypeInfo().BaseType)
for (Type type = baseObject.GetType(); type != null; type = type.BaseType)
{
result.Add(type.FullName);
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/CommandHelpProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ private static string GetCmdletAssemblyPath(CmdletInfo cmdletInfo)
if (cmdletInfo.ImplementingType == null)
return null;

return Path.GetDirectoryName(cmdletInfo.ImplementingType.GetTypeInfo().Assembly.Location);
return Path.GetDirectoryName(cmdletInfo.ImplementingType.Assembly.Location);
}

/// <summary>
Expand Down
10 changes: 5 additions & 5 deletions src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,33 +306,33 @@ private static void AddSyntaxParametersProperties(PSObject obj, IEnumerable<Comm
}
else
{
if (parameter.ParameterType.GetTypeInfo().IsEnum && (Enum.GetNames(parameter.ParameterType) != null))
if (parameter.ParameterType.IsEnum && (Enum.GetNames(parameter.ParameterType) != null))
{
AddParameterValueGroupProperties(mshObject, Enum.GetNames(parameter.ParameterType));
}
else if (parameter.ParameterType.IsArray)
{
if (parameter.ParameterType.GetElementType().GetTypeInfo().IsEnum &&
if (parameter.ParameterType.GetElementType().IsEnum &&
Enum.GetNames(parameter.ParameterType.GetElementType()) != null)
{
AddParameterValueGroupProperties(mshObject, Enum.GetNames(parameter.ParameterType.GetElementType()));
}
}
else if (parameter.ParameterType.GetTypeInfo().IsGenericType)
else if (parameter.ParameterType.IsGenericType)
{
Type[] types = parameter.ParameterType.GetGenericArguments();

if (types.Length != 0)
{
Type type = types[0];

if (type.GetTypeInfo().IsEnum && (Enum.GetNames(type) != null))
if (type.IsEnum && (Enum.GetNames(type) != null))
{
AddParameterValueGroupProperties(mshObject, Enum.GetNames(type));
}
else if (type.IsArray)
{
if (type.GetElementType().GetTypeInfo().IsEnum &&
if (type.GetElementType().IsEnum &&
Enum.GetNames(type.GetElementType()) != null)
{
AddParameterValueGroupProperties(mshObject, Enum.GetNames(type.GetElementType()));
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/HelpCategoryInvalidException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public HelpCategoryInvalidException(string helpCategory, Exception innerExceptio
private void CreateErrorRecord()
{
_errorRecord = new ErrorRecord(new ParentContainsErrorRecordException(this), "HelpCategoryInvalid", ErrorCategory.InvalidArgument, null);
_errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpCategoryInvalidException).GetTypeInfo().Assembly, "HelpErrors", "HelpCategoryInvalid", _helpCategory);
_errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpCategoryInvalidException).Assembly, "HelpErrors", "HelpCategoryInvalid", _helpCategory);
}

private ErrorRecord _errorRecord;
Expand Down
5 changes: 2 additions & 3 deletions src/System.Management.Automation/help/HelpCommentsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,9 @@ private XmlElement BuildXmlForParameter(
if (type == null)
type = typeof(object);

var typeInfo = type.GetTypeInfo();
var elementType = typeInfo.IsArray ? typeInfo.GetElementType() : type;
var elementType = type.IsArray ? type.GetElementType() : type;

if (elementType.GetTypeInfo().IsEnum)
if (elementType.IsEnum)
{
XmlElement parameterValueGroup = _doc.CreateElement("command:parameterValueGroup", commandURI);
foreach (string valueName in Enum.GetNames(elementType))
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/HelpErrorTracer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void Dispose()
if (_helpTracer.HelpSystem.VerboseHelpErrors && _errors.Count > 0)
{
ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("Help Load Error"), "HelpLoadError", ErrorCategory.SyntaxError, null);
errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpErrorTracer).GetTypeInfo().Assembly, "HelpErrors", "HelpLoadError", _helpFile, _errors.Count);
errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpErrorTracer).Assembly, "HelpErrors", "HelpLoadError", _helpFile, _errors.Count);
_helpTracer.HelpSystem.LastErrors.Add(errorRecord);

foreach (ErrorRecord error in _errors)
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/HelpNotFoundException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void CreateErrorRecord()
// Don't do ParentContainsErrorRecordException(this), as this causes recursion, and creates a
// segmentation fault on Linux
_errorRecord = new ErrorRecord(new ParentContainsErrorRecordException(errMessage), "HelpNotFound", ErrorCategory.ResourceUnavailable, null);
_errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpNotFoundException).GetTypeInfo().Assembly, "HelpErrors", "HelpNotFound", _helpTopic);
_errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpNotFoundException).Assembly, "HelpErrors", "HelpNotFound", _helpTopic);
}

private ErrorRecord _errorRecord;
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/help/HelpProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ internal virtual void Reset()
internal void ReportHelpFileError(Exception exception, string target, string helpFile)
{
ErrorRecord errorRecord = new ErrorRecord(exception, "LoadHelpFileForTargetFailed", ErrorCategory.OpenError, null);
errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpProvider).GetTypeInfo().Assembly, "HelpErrors", "LoadHelpFileForTargetFailed", target, helpFile, exception.Message);
errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpProvider).Assembly, "HelpErrors", "LoadHelpFileForTargetFailed", target, helpFile, exception.Message);
this.HelpSystem.LastErrors.Add(errorRecord);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/help/MamlNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ private int GetParaMamlNodeCount(XmlNodeList nodes)
private void WriteMamlInvalidChildNodeError(XmlNode node, XmlNode childNode)
{
ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("MamlInvalidChildNodeError"), "MamlInvalidChildNodeError", ErrorCategory.SyntaxError, null);
errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).GetTypeInfo().Assembly, "HelpErrors", "MamlInvalidChildNodeError", node.LocalName, childNode.LocalName, GetNodePath(node));
errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).Assembly, "HelpErrors", "MamlInvalidChildNodeError", node.LocalName, childNode.LocalName, GetNodePath(node));
this.Errors.Add(errorRecord);
}

Expand All @@ -694,7 +694,7 @@ private void WriteMamlInvalidChildNodeError(XmlNode node, XmlNode childNode)
private void WriteMamlInvalidChildNodeCountError(XmlNode node, string childNodeName, int count)
{
ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("MamlInvalidChildNodeCountError"), "MamlInvalidChildNodeCountError", ErrorCategory.SyntaxError, null);
errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).GetTypeInfo().Assembly, "HelpErrors", "MamlInvalidChildNodeCountError", node.LocalName, childNodeName, count, GetNodePath(node));
errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).Assembly, "HelpErrors", "MamlInvalidChildNodeCountError", node.LocalName, childNodeName, count, GetNodePath(node));
this.Errors.Add(errorRecord);
}

Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/help/ProviderHelpProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ internal override IEnumerable<HelpInfo> ExactMatchHelp(HelpRequest helpRequest)
if (this.HelpSystem.LastHelpCategory == HelpCategory.Provider)
{
ErrorRecord errorRecord = new ErrorRecord(e, "ProviderLoadError", ErrorCategory.ResourceUnavailable, null);
errorRecord.ErrorDetails = new ErrorDetails(typeof(ProviderHelpProvider).GetTypeInfo().Assembly, "HelpErrors", "ProviderLoadError", helpRequest.Target, e.Message);
errorRecord.ErrorDetails = new ErrorDetails(typeof(ProviderHelpProvider).Assembly, "HelpErrors", "ProviderLoadError", helpRequest.Target, e.Message);
this.HelpSystem.LastErrors.Add(errorRecord);
}
}
Expand Down Expand Up @@ -126,7 +126,7 @@ private static string GetProviderAssemblyPath(ProviderInfo providerInfo)
if (providerInfo.ImplementingType == null)
return null;

return Path.GetDirectoryName(providerInfo.ImplementingType.GetTypeInfo().Assembly.Location);
return Path.GetDirectoryName(providerInfo.ImplementingType.Assembly.Location);
}

/// <summary>
Expand Down