From b1fd5cc689eac43a6572aac13307e06feb1831f2 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Wed, 9 Apr 2014 01:10:07 -0700
Subject: [PATCH] Made a few more changes since we have new tooling - Remove
 runtime interface declarations and use   Microsoft.Net.Runtime.Interfaces
 package - Made tests compile for net45 and made default   intellisense view
 net45 for unit tests since Moq   doesn't work

---
 .../Microsoft.AspNet.Mvc.Core.kproj              |  6 ------
 .../Services/AssemblyNeutralAttribute.cs         | 11 -----------
 .../Services/ILibraryExport.cs                   | 12 ------------
 .../Services/ILibraryInformation.cs              | 12 ------------
 .../Services/ILibraryManager.cs                  | 16 ----------------
 .../Services/IMetadataReference.cs               |  9 ---------
 .../Services/ISourceReference.cs                 |  7 -------
 src/Microsoft.AspNet.Mvc.Core/project.json       |  3 ++-
 .../Microsoft.AspNet.Mvc.Razor.kproj             |  3 ---
 .../Services/IApplicationEnvironment.cs          | 14 --------------
 .../Services/IAssemblyLoaderEngine.cs            | 11 -----------
 .../Services/IMetadataFileReference.cs           |  9 ---------
 src/Microsoft.AspNet.Mvc.Razor/project.json      |  3 ++-
 .../Microsoft.AspNet.Mvc.Core.Test.kproj         |  1 +
 .../Microsoft.AspNet.Mvc.ModelBinding.Test.kproj |  1 +
 .../project.json                                 | 15 ---------------
 .../Microsoft.AspNet.Mvc.Razor.Test.kproj        |  1 +
 17 files changed, 7 insertions(+), 127 deletions(-)
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/AssemblyNeutralAttribute.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/ILibraryExport.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/ILibraryInformation.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/ILibraryManager.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/IMetadataReference.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Core/Services/ISourceReference.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Razor/Services/IApplicationEnvironment.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Razor/Services/IAssemblyLoaderEngine.cs
 delete mode 100644 src/Microsoft.AspNet.Mvc.Razor/Services/IMetadataFileReference.cs

diff --git a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
index ac439797de..2ae35dca74 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
+++ b/src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj
@@ -162,12 +162,6 @@
     <Compile Include="RouteConstraintAttribute.cs" />
     <Compile Include="RouteDataActionConstraint.cs" />
     <Compile Include="RouteKeyHandling.cs" />
-    <Compile Include="Services\AssemblyNeutralAttribute.cs" />
-    <Compile Include="Services\ILibraryExport.cs" />
-    <Compile Include="Services\ILibraryInformation.cs" />
-    <Compile Include="Services\ILibraryManager.cs" />
-    <Compile Include="Services\IMetadataReference.cs" />
-    <Compile Include="Services\ISourceReference.cs" />
     <Compile Include="TemplateInfo.cs" />
     <Compile Include="UrlHelper.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/AssemblyNeutralAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Services/AssemblyNeutralAttribute.cs
deleted file mode 100644
index c0d5952411..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/AssemblyNeutralAttribute.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public class AssemblyNeutralAttribute : Attribute { }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryExport.cs b/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryExport.cs
deleted file mode 100644
index 7ccb5fcc67..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryExport.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface ILibraryExport
-    {
-        IList<IMetadataReference> MetadataReferences { get; }
-        IList<ISourceReference> SourceReferences { get; }
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryInformation.cs b/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryInformation.cs
deleted file mode 100644
index 9d47458cf5..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryInformation.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface ILibraryInformation
-    {
-        string Name { get; }
-
-        IEnumerable<string> Dependencies { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryManager.cs b/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryManager.cs
deleted file mode 100644
index 1f714af5d9..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/ILibraryManager.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface ILibraryManager
-    {
-        ILibraryExport GetLibraryExport(string name);
-
-        IEnumerable<ILibraryInformation> GetReferencingLibraries(string name);
-
-        ILibraryInformation GetLibraryInformation(string name);
-
-        IEnumerable<ILibraryInformation> GetLibraries();
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/IMetadataReference.cs b/src/Microsoft.AspNet.Mvc.Core/Services/IMetadataReference.cs
deleted file mode 100644
index 851746ca4f..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/IMetadataReference.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface IMetadataReference
-    {
-        string Name { get; }
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Core/Services/ISourceReference.cs b/src/Microsoft.AspNet.Mvc.Core/Services/ISourceReference.cs
deleted file mode 100644
index cfb404e908..0000000000
--- a/src/Microsoft.AspNet.Mvc.Core/Services/ISourceReference.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface ISourceReference
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json
index 3221eea6c1..30481e9172 100644
--- a/src/Microsoft.AspNet.Mvc.Core/project.json
+++ b/src/Microsoft.AspNet.Mvc.Core/project.json
@@ -6,7 +6,8 @@
     "Microsoft.AspNet.Abstractions": "0.1-alpha-*",
     "Microsoft.AspNet.Routing": "0.1-alpha-*",
     "Common": "",
-    "Microsoft.AspNet.Mvc.ModelBinding": ""
+    "Microsoft.AspNet.Mvc.ModelBinding": "",
+    "Microsoft.Net.Runtime.Interfaces":  "0.1-alpha-*"
   },
   "configurations": {
     "net45": {},
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
index 03d9d0cfc0..1dc0ee0ea2 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
+++ b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.kproj
@@ -40,9 +40,6 @@
     <Compile Include="RazorViewOfT.cs" />
     <Compile Include="Razor\IRazorCompilationService.cs" />
     <Compile Include="Razor\RazorCompilationService.cs" />
-    <Compile Include="Services\IApplicationEnvironment.cs" />
-    <Compile Include="Services\IAssemblyLoaderEngine.cs" />
-    <Compile Include="Services\IMetadataFileReference.cs" />
     <Compile Include="Services\IRoslynMetadataReference.cs" />
     <Compile Include="ViewEngine\IVirtualPathViewFactory.cs" />
     <Compile Include="ViewEngine\RazorViewEngine.cs" />
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Services/IApplicationEnvironment.cs b/src/Microsoft.AspNet.Mvc.Razor/Services/IApplicationEnvironment.cs
deleted file mode 100644
index fcf14c7850..0000000000
--- a/src/Microsoft.AspNet.Mvc.Razor/Services/IApplicationEnvironment.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Runtime.Versioning;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface IApplicationEnvironment
-    {
-        string ApplicationName { get; }
-        string Version { get; }
-        string ApplicationBasePath { get; }
-        FrameworkName TargetFramework { get; }
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Services/IAssemblyLoaderEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/Services/IAssemblyLoaderEngine.cs
deleted file mode 100644
index 0a47b08aff..0000000000
--- a/src/Microsoft.AspNet.Mvc.Razor/Services/IAssemblyLoaderEngine.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Reflection;
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface IAssemblyLoaderEngine
-    {
-        Assembly LoadFile(string path);
-        Assembly LoadBytes(byte[] assemblyBytes, byte[] pdbBytes);
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Services/IMetadataFileReference.cs b/src/Microsoft.AspNet.Mvc.Razor/Services/IMetadataFileReference.cs
deleted file mode 100644
index 194fcf0be6..0000000000
--- a/src/Microsoft.AspNet.Mvc.Razor/Services/IMetadataFileReference.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-
-namespace Microsoft.Net.Runtime
-{
-    [AssemblyNeutral]
-    public interface IMetadataFileReference : IMetadataReference
-    {
-        string Path { get; }
-    }
-}
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 0c3a7e3591..1a87535c8c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -11,7 +11,8 @@
     "Microsoft.CodeAnalysis.Common" : "0.7-beta-*",
     "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*",
     "System.Reflection.Metadata.Ecma335": "0.7-beta-*",
-    "Microsoft.Bcl.Immutable": "1.1.18-beta-*"
+    "Microsoft.Bcl.Immutable": "1.1.18-beta-*",
+    "Microsoft.Net.Runtime.Interfaces":  "0.1-alpha-*"
   },
   "configurations": {
     "net45": {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
index 12c90d515b..17d4e4dc8e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj
@@ -8,6 +8,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a8aa326e-8ee8-4f11-b750-23028e0949d7</ProjectGuid>
     <OutputType>Library</OutputType>
+    <ActiveTargetFramework>net45</ActiveTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
index 708b58e4d2..a9be9a260d 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Microsoft.AspNet.Mvc.ModelBinding.Test.kproj
@@ -8,6 +8,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>3b8dc0c0-6c55-4034-ad96-de1000928e6b</ProjectGuid>
     <OutputType>Library</OutputType>
+    <ActiveTargetFramework>net45</ActiveTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
index be920cdee9..360af4761d 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
@@ -25,21 +25,6 @@
         "System.Reflection": "",
         "System.Runtime.Serialization": ""
       }
-    },
-    "k10" : { 
-      dependencies: {
-        "System.Collections": "4.0.0.0",
-        "System.ComponentModel": "4.0.0.0",
-        "System.Globalization": "4.0.10.0",
-        "System.Linq": "4.0.0.0",
-        "System.Reflection": "4.0.10.0",
-        "System.Runtime": "4.0.20.0",
-        "System.Runtime.Extensions": "4.0.10.0",
-        "System.Runtime.Serialization.Primitives": "4.0.0.0",
-        "System.Threading": "4.0.0.0",
-        "System.Threading.Tasks": "4.0.10.0",
-        "System.Threading.Thread": "4.0.0.0"
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
index ac60ec482a..45daf3311b 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Microsoft.AspNet.Mvc.Razor.Test.kproj
@@ -8,6 +8,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>3f6e355e-4869-41d9-943b-d54771221a7f</ProjectGuid>
     <OutputType>Library</OutputType>
+    <ActiveTargetFramework>net45</ActiveTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>