Merge pull request #796 from PowerShell/vors/add-type

Make Add-Type work without a flat folder structure

src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs

@@ -1059,8 +1059,9 @@ namespace Microsoft.PowerShell.Commands
         private static PortableExecutableReference ObjectImplementationAssemblyReference =
             MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location);
 
+        // This assembly should be System.Runtime.dll
         private static PortableExecutableReference ObjectDeclaredAssemblyReference =
-            MetadataReference.CreateFromFile(System.IO.Path.Combine(FrameworkFolder, "System.Runtime.dll"));
+            MetadataReference.CreateFromFile(ClrFacade.GetAssemblies(typeof(object).FullName).First().Location);
 
         private static MetadataReference[] defaultAssemblies = new MetadataReference[]
         {

test/powershell/Add-Type.Tests.ps1

@@ -1,5 +1,5 @@
 Describe "Add-Type" {
-    It "Should not throw given a simple class definition" -Skip {
+    It "Should not throw given a simple class definition" {
 	{ Add-Type -TypeDefinition "public static class foo { }" } | Should Not Throw
     }
 }