RIP ANI :(

aspnet · Feb 13, 2015 · 5f8bf56 · 5f8bf56 · ChrisMcKee · Mar 20, 2015
1 parent e759552
commit 5f8bf56
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 1,258 deletions.
diff --git a/samples/HelloWorld/compiler/preprocess/HelloMetaProgramming.cs b/samples/HelloWorld/compiler/preprocess/HelloMetaProgramming.cs
@@ -34,41 +34,4 @@ public void AfterCompile(IAfterCompileContext context)
 
         }
     }
-}
-
-namespace Microsoft.Framework.Runtime
-{
-    [AssemblyNeutral]
-    public class AssemblyNeutralAttribute : Attribute
-    {
-    }
-
-    /// <summary>
-    /// Summary description for ICompileModule
-    /// </summary>
-    [AssemblyNeutral]
-    public interface ICompileModule
-    {
-        void BeforeCompile(IBeforeCompileContext context);
-
-        void AfterCompile(IAfterCompileContext context);
-    }
-
-    [AssemblyNeutral]
-    public interface IBeforeCompileContext
-    {
-        CSharpCompilation CSharpCompilation { get; set; }
-
-        IList<ResourceDescription> Resources { get; }
-
-        IList<Diagnostic> Diagnostics { get; }
-    }
-
-    [AssemblyNeutral]
-    public interface IAfterCompileContext
-    {
-        CSharpCompilation CSharpCompilation { get; set; }
-
-        IList<Diagnostic> Diagnostics { get; }
-    }
-}
+}
diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json
@@ -3,7 +3,7 @@
     "exclude": "more/*.cs",
     "dependencies": {
         "HelloShared": { "version": "0.1-beta-*", "type": "build" },
-        "Microsoft.CodeAnalysis.CSharp": "1.0.0-rc1-*"
+        "Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*"
     },
     "commands": {
         "hi": "HelloWorld --mode amazing",

diff --git a/src/Microsoft.Framework.ApplicationHost2/Microsoft.Framework.ApplicationHost2.kproj b/src/Microsoft.Framework.ApplicationHost2/Microsoft.Framework.ApplicationHost2.kproj
@@ -13,8 +13,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/Microsoft.Framework.Runtime.Loader/LoadContext.cs b/src/Microsoft.Framework.Runtime.Loader/LoadContext.cs
@@ -34,7 +34,6 @@ protected override Assembly Load(AssemblyName assemblyName)
                     if (assembly != null)
                     {
                         _assemblyCache[name] = assembly;
-                        ExtractAssemblyNeutralInterfaces(assembly);
                     }
                 }
 
@@ -101,30 +100,6 @@ public void Dispose()
         {
 
         }
-
-        private void ExtractAssemblyNeutralInterfaces(Assembly assembly)
-        {
-            // Embedded assemblies end with .dll
-            foreach (var resourceName in assembly.GetManifestResourceNames())
-            {
-                if (resourceName.StartsWith("AssemblyNeutral/") &&
-                    resourceName.EndsWith(".dll"))
-                {
-                    var assemblyName = Path.GetFileNameWithoutExtension(resourceName);
-
-                    var neutralAssemblyStream = assembly.GetManifestResourceStream(resourceName);
-
-                    try
-                    {
-                        _defaultContext.LoadStream(neutralAssemblyStream, assemblySymbols: null);
-                    }
-                    catch (FileLoadException)
-                    {
-                        // Already loaded
-                    }
-                }
-            }
-        }
     }
 #else
     public abstract class LoadContext : IAssemblyLoadContext

diff --git a/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/AssemblyNeutralWorker.cs b/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/AssemblyNeutralWorker.cs
diff --git a/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/EmbeddedMetadataReference.cs b/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/EmbeddedMetadataReference.cs