Change TypeInfo to Type.

charlesbetros · charlesbetros · commit c8409785280a · 2017-10-17T21:55:43.000-05:00
diff --git a/Resources/Dependencies/DapperExtensions.StrongName/DapperExtensionsConfiguration.cs b/Resources/Dependencies/DapperExtensions.StrongName/DapperExtensionsConfiguration.cs
@@ -98,7 +98,7 @@ protected virtual Type GetMapType(Type entityType)
                         select type).SingleOrDefault();
             };
 
-            Type result = getType(entityType.GetTypeInfo().Assembly);
+            Type result = getType(entityType.Assembly);
             if (result != null)
             {
                 return result;
@@ -113,7 +113,7 @@ protected virtual Type GetMapType(Type entityType)
                 }
             }
 
-            return getType(entityType.GetTypeInfo().Assembly);
+            return getType(entityType.Assembly);
         }
     }
-}
+}
diff --git a/Resources/Dependencies/DapperExtensions.StrongName/ReflectionHelper.cs b/Resources/Dependencies/DapperExtensions.StrongName/ReflectionHelper.cs
@@ -30,7 +30,7 @@ public static class ReflectionHelper
                                    typeof(DateTimeOffset),
                                    typeof(byte[])
                                };
-        
+
         public static MemberInfo GetProperty(LambdaExpression lambda)
         {
             Expression expr = lambda;
@@ -84,7 +84,7 @@ public static string AppendStrings(this IEnumerable<string> list, string seperat
         public static bool IsSimpleType(Type type)
         {
             Type actualType = type;
-            if (type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
             {
                 actualType = type.GetGenericArguments()[0];
             }
@@ -104,4 +104,4 @@ public static string SetParameterName(this IDictionary<string, object> parameter
             return name;
         }
     }
-}
+}
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs
@@ -253,7 +253,7 @@ private void RunIL2CPU(string kernelFileName, string outputFile)
                     xArgs.Insert(0, "run");
                     xArgs.Insert(1, "--no-build");
                     xArgs.Insert(2, " -- ");
-                    RunProcess("dotnet", xIL2CPUPath, xArgs, true);
+                    RunProcess("dotnet", xIL2CPUPath, xArgs);
                 }
             }
         }
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.cs b/Tests/Cosmos.TestRunner.Core/Engine.cs
@@ -1,9 +1,7 @@
+using Cosmos.Build.Common;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-
-using Cosmos.Build.Common;
 
 namespace Cosmos.TestRunner.Core
 {
@@ -59,7 +57,7 @@ public bool Execute()
                     {
                         foreach (var xAssemblyFile in KernelsToRun)
                         {
-                            mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).GetTypeInfo().Assembly.Location), "WorkingDirectory");
+                            mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).Assembly.Location), "WorkingDirectory");
                             if (Directory.Exists(mBaseWorkingDirectory))
                             {
                                 Directory.Delete(mBaseWorkingDirectory, true);
diff --git a/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs b/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs
@@ -8,8 +8,8 @@ public static class TestKernelSets
         // Kernel types to run: the ones that will run in test runners that use the default engine configuration.
         public static IEnumerable<Type> GetKernelTypesToRun()
         {
-            yield return typeof(KernelGen3.Boot);
-            //return GetStableKernelTypes();
+            //yield return typeof(KernelGen3.Boot);
+            return GetStableKernelTypes();
         }
 
         // Stable kernel types: the ones that are stable and will run in AppVeyor
diff --git a/Tests/Cosmos.TestRunner.UnitTest/MyEngine.cs b/Tests/Cosmos.TestRunner.UnitTest/MyEngine.cs
@@ -1,11 +1,8 @@
-﻿using System;
-using System.IO;
-using System.Reflection;
-
-using Cosmos.Build.Common;
+﻿using Cosmos.Build.Common;
 using Cosmos.TestRunner.Core;
-
 using NUnit.Framework;
+using System;
+using System.IO;
 
 namespace Cosmos.TestRunner.UnitTest
 {
@@ -19,7 +16,7 @@ public void Test(Type kernelToRun)
         {
             try
             {
-                Directory.SetCurrentDirectory(Path.GetDirectoryName(typeof(RunKernels).GetTypeInfo().Assembly.Location));
+                Directory.SetCurrentDirectory(Path.GetDirectoryName(typeof(RunKernels).Assembly.Location));
 
                 var xEngine = new Engine();
 
@@ -41,7 +38,7 @@ public void Test(Type kernelToRun)
                 xEngine.StackCorruptionChecksLevel = StackCorruptionDetectionLevel.MethodFooters;
 
                 // Select kernels to be tested by adding them to the engine
-                xEngine.AddKernel(kernelToRun.GetTypeInfo().Assembly.Location);
+                xEngine.AddKernel(kernelToRun.Assembly.Location);
 
                 xEngine.OutputHandler = new TestOutputHandler();
 
diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp2.0</TargetFramework>
+        <OutputType>Exe</OutputType>
         <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
         <DebugType>Full</DebugType>
         <SignAssembly>True</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
-        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj b/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp2.0</TargetFramework>
-        <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
+        <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
         <DebugType>Full</DebugType>
         <SignAssembly>True</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
diff --git a/Tools/PlugsInspector/PlugsInspector.csproj b/Tools/PlugsInspector/PlugsInspector.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net462</TargetFramework>
-        <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
+        <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
         <DebugType>Full</DebugType>
         <SignAssembly>True</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
@@ -36,4 +36,4 @@
       </Compile>
     </ItemGroup>
 
-</Project>
+</Project>
diff --git a/source/Cosmos.Build.Common/EnumValue.cs b/source/Cosmos.Build.Common/EnumValue.cs
@@ -1,9 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.ComponentModel;
 
 namespace Cosmos.Build.Common
 {
@@ -24,7 +21,7 @@ public static T Parse<T>(string value, T @default)
             T result = @default;
 
             Type valueType = typeof(T);
-            if (valueType.GetTypeInfo().IsEnum == false)
+            if (valueType.IsEnum == false)
             {
                 throw new ArgumentException("Enum types only supported.", "T");
             }
@@ -55,7 +52,7 @@ public static EnumValue Find(System.Collections.IEnumerable items, Enum value)
 
         public static EnumValue[] GetEnumValues(Type enumType, bool aSort)
         {
-            if (!enumType.GetTypeInfo().IsEnum)
+            if (!enumType.IsEnum)
             {
                 throw new Exception("Invalid type, only enum types allowed.");
             }
diff --git a/source/Cosmos.Build.Common/PropertiesBase.cs b/source/Cosmos.Build.Common/PropertiesBase.cs
diff --git a/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs
diff --git a/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs b/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs
diff --git a/source/TheRingMaster/Program.cs b/source/TheRingMaster/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ protected virtual Type GetMapType(Type entityType)`
`98`	`98`	`select type).SingleOrDefault();`
`99`	`99`	`};`
`100`	`100`
`101`		`- Type result = getType(entityType.GetTypeInfo().Assembly);`
	`101`	`+ Type result = getType(entityType.Assembly);`
`102`	`102`	`if (result != null)`
`103`	`103`	`{`
`104`	`104`	`return result;`
`@@ -113,7 +113,7 @@ protected virtual Type GetMapType(Type entityType)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- return getType(entityType.GetTypeInfo().Assembly);`
	`116`	`+ return getType(entityType.Assembly);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`		`-}`
	`119`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static class ReflectionHelper`
`30`	`30`	`typeof(DateTimeOffset),`
`31`	`31`	`typeof(byte[])`
`32`	`32`	`};`
`33`		`-`
	`33`	`+`
`34`	`34`	`public static MemberInfo GetProperty(LambdaExpression lambda)`
`35`	`35`	`{`
`36`	`36`	`Expression expr = lambda;`
`@@ -84,7 +84,7 @@ public static string AppendStrings(this IEnumerable<string> list, string seperat`
`84`	`84`	`public static bool IsSimpleType(Type type)`
`85`	`85`	`{`
`86`	`86`	`Type actualType = type;`
`87`		`- if (type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))`
	`87`	`+ if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))`
`88`	`88`	`{`
`89`	`89`	`actualType = type.GetGenericArguments()[0];`
`90`	`90`	`}`
`@@ -104,4 +104,4 @@ public static string SetParameterName(this IDictionary<string, object> parameter`
`104`	`104`	`return name;`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-}`
	`107`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private void RunIL2CPU(string kernelFileName, string outputFile)`
`253`	`253`	`xArgs.Insert(0, "run");`
`254`	`254`	`xArgs.Insert(1, "--no-build");`
`255`	`255`	`xArgs.Insert(2, " -- ");`
`256`		`- RunProcess("dotnet", xIL2CPUPath, xArgs, true);`
	`256`	`+ RunProcess("dotnet", xIL2CPUPath, xArgs);`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
	`1`	`+using Cosmos.Build.Common;`
`1`	`2`	`using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.IO;`
`4`		`-using System.Reflection;`
`5`		`-`
`6`		`-using Cosmos.Build.Common;`
`7`	`5`
`8`	`6`	`namespace Cosmos.TestRunner.Core`
`9`	`7`	`{`
`@@ -59,7 +57,7 @@ public bool Execute()`
`59`	`57`	`{`
`60`	`58`	`foreach (var xAssemblyFile in KernelsToRun)`
`61`	`59`	`{`
`62`		`- mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).GetTypeInfo().Assembly.Location), "WorkingDirectory");`
	`60`	`+ mBaseWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(Engine).Assembly.Location), "WorkingDirectory");`
`63`	`61`	`if (Directory.Exists(mBaseWorkingDirectory))`
`64`	`62`	`{`
`65`	`63`	`Directory.Delete(mBaseWorkingDirectory, true);`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ public static class TestKernelSets`
`8`	`8`	`// Kernel types to run: the ones that will run in test runners that use the default engine configuration.`
`9`	`9`	`public static IEnumerable<Type> GetKernelTypesToRun()`
`10`	`10`	`{`
`11`		`- yield return typeof(KernelGen3.Boot);`
`12`		`- //return GetStableKernelTypes();`
	`11`	`+ //yield return typeof(KernelGen3.Boot);`
	`12`	`+ return GetStableKernelTypes();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// Stable kernel types: the ones that are stable and will run in AppVeyor`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-using System.Reflection;`
`5`		`-using System.Text;`
`6`		`-using System.ComponentModel;`
`7`	`4`
`8`	`5`	`namespace Cosmos.Build.Common`
`9`	`6`	`{`
`@@ -24,7 +21,7 @@ public static T Parse<T>(string value, T @default)`
`24`	`21`	`T result = @default;`
`25`	`22`
`26`	`23`	`Type valueType = typeof(T);`
`27`		`- if (valueType.GetTypeInfo().IsEnum == false)`
	`24`	`+ if (valueType.IsEnum == false)`
`28`	`25`	`{`
`29`	`26`	`throw new ArgumentException("Enum types only supported.", "T");`
`30`	`27`	`}`
`@@ -55,7 +52,7 @@ public static EnumValue Find(System.Collections.IEnumerable items, Enum value)`
`55`	`52`
`56`	`53`	`public static EnumValue[] GetEnumValues(Type enumType, bool aSort)`
`57`	`54`	`{`
`58`		`- if (!enumType.GetTypeInfo().IsEnum)`
	`55`	`+ if (!enumType.IsEnum)`
`59`	`56`	`{`
`60`	`57`	`throw new Exception("Invalid type, only enum types allowed.");`
`61`	`58`	`}`