Change TypeInfo to Type.

jamesphenry · Oct 18, 2017 · c840978 · c840978
1 parent ec41cc0
commit c840978
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 151 deletions.
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.");
             }