Remove extra `[NotNull]` definition and second AssemblyInfo.cs file

- add necessary build-time dependency
- add missing `using Microsoft.Framework.Internal;` statements
- remove `[NotNull]` from tests
 - avoid duplicate definitions of `[NotNull]` from referenced projects
- remove incorrect NotNullArgument.cs and second AssemblyInfo.cs files entirely
 - merge content into AssemblyInfo.cs file in expected location

nit: clean up some trailing whitespace

src/Microsoft.AspNet.Razor.Runtime/AssemblyInfo.cs

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Razor.Runtime.Test")]

src/Microsoft.AspNet.Razor.Runtime/Properties/AssemblyInfo.cs

@@ -2,5 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
-[assembly: AssemblyMetadata("Serviceable", "True")]
+[assembly: AssemblyMetadata("Serviceable", "True")]
+[assembly: InternalsVisibleTo("Microsoft.AspNet.Razor.Runtime.Test")]

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs

@@ -7,6 +7,7 @@ using System.Globalization;
 using System.Linq;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpTagHelperCodeRenderer.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Globalization;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.Framework.Internal;
+
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {
     /// <summary>

src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {

src/Microsoft.AspNet.Razor/Generator/GeneratedClassContext.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Generator
 {

src/Microsoft.AspNet.Razor/GeneratorResults.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

src/Microsoft.AspNet.Razor/NotNullArgument.cs

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNet.Razor
-{
-    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
-    internal sealed class NotNullAttribute : Attribute
-    {
-    }
-}

src/Microsoft.AspNet.Razor/Parser/ParserContext.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Utils;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser
 {

src/Microsoft.AspNet.Razor/Parser/RazorParser.cs

@@ -13,6 +13,7 @@ using Microsoft.AspNet.Razor.Parser.TagHelpers;
 using Microsoft.AspNet.Razor.Parser.TagHelpers.Internal;
 using Microsoft.AspNet.Razor.TagHelpers;
 using Microsoft.AspNet.Razor.Text;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser
 {
@@ -205,14 +206,14 @@ namespace Microsoft.AspNet.Razor.Parser
         /// specified <paramref name="documentRoot"/>.
         /// </summary>
         /// <param name="documentRoot">The <see cref="Block"/> to scan for tag helper registrations in.</param>
-        /// <param name="errorSink">Used to manage <see cref="RazorError"/>s encountered during the Razor parsing 
+        /// <param name="errorSink">Used to manage <see cref="RazorError"/>s encountered during the Razor parsing
         /// phase.</param>
         /// <returns><see cref="TagHelperDescriptor"/>s that are applicable to the <paramref name="documentRoot"/>
         /// </returns>
         protected virtual IEnumerable<TagHelperDescriptor> GetTagHelperDescriptors([NotNull] Block documentRoot,
                                                                                    [NotNull] ErrorSink errorSink)
         {
-            var addOrRemoveTagHelperSpanVisitor = 
+            var addOrRemoveTagHelperSpanVisitor =
                 new TagHelperDirectiveSpanVisitor(TagHelperDescriptorResolver, errorSink);
             return addOrRemoveTagHelperSpanVisitor.GetDescriptors(documentRoot);
         }

src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser.TagHelpers
 {
@@ -25,8 +26,9 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
         {
         }
 
-        public TagHelperDirectiveSpanVisitor([NotNull] ITagHelperDescriptorResolver descriptorResolver,
+        public TagHelperDirectiveSpanVisitor(
-                                               [NotNull] ErrorSink errorSink)
+            [NotNull] ITagHelperDescriptorResolver descriptorResolver,
+            [NotNull] ErrorSink errorSink)
         {
             _descriptorResolver = descriptorResolver;
             _errorSink = errorSink;
@@ -61,14 +63,14 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
             {
                 var codeGenerator = (AddOrRemoveTagHelperCodeGenerator)span.CodeGenerator;
 
-                var directive = 
+                var directive =
                     codeGenerator.RemoveTagHelperDescriptors ?
                     TagHelperDirectiveType.RemoveTagHelper :
                     TagHelperDirectiveType.AddTagHelper;
 
                 var directiveDescriptor = new TagHelperDirectiveDescriptor(
-                    codeGenerator.LookupText, 
+                    codeGenerator.LookupText,
-                    span.Start, 
+                    span.Start,
                     directive);
 
                 _directiveDescriptors.Add(directiveDescriptor);

src/Microsoft.AspNet.Razor/ParserResults.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

src/Microsoft.AspNet.Razor/RazorEngineHost.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler;
 using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Text;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

src/Microsoft.AspNet.Razor/SourceLocation.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using Microsoft.AspNet.Razor.Text;
+using Microsoft.Framework.Internal;
 using Microsoft.Internal.Web.Utils;
 
 namespace Microsoft.AspNet.Razor

src/Microsoft.AspNet.Razor/TagHelpers/TagHelperAttributeValueCodeRenderer.cs

@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Razor.Generator;
 using Microsoft.AspNet.Razor.Generator.Compiler.CSharp;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.TagHelpers
 {

src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDescriptor.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.TagHelpers
 {

src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDescriptorResolutionContext.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Razor.TagHelpers
 {

src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDirectiveDescriptor.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.Framework.Internal;
+
 namespace Microsoft.AspNet.Razor.TagHelpers
 {
     /// <summary>

src/Microsoft.AspNet.Razor/project.json

@@ -1,6 +1,9 @@
 {
     "description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.",
     "version": "4.0.0-*",
+    "dependencies": {
+        "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }
+    },
     "frameworks": {
         "net45": { },
         "dnx451": { },

test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs

@@ -16,9 +16,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         {
         }
 
-        public bool Equals(
+        public bool Equals(IReadOnlyTagHelperAttribute attributeX, IReadOnlyTagHelperAttribute attributeY)
-            [NotNull] IReadOnlyTagHelperAttribute attributeX,
-            [NotNull] IReadOnlyTagHelperAttribute attributeY)
         {
             return
                 attributeX == attributeY ||
@@ -27,7 +25,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                 Equals(attributeX.Value, attributeY.Value);
         }
 
-        public int GetHashCode([NotNull] IReadOnlyTagHelperAttribute attribute)
+        public int GetHashCode(IReadOnlyTagHelperAttribute attribute)
         {
             return HashCodeCombiner
                 .Start()

test/Microsoft.AspNet.Razor.Test/Generator/TagHelperAttributeValueCodeRendererTest.cs

@@ -70,8 +70,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator
             {
             }
 
-            protected override CSharpCodeVisitor CreateCSharpCodeVisitor([NotNull] CSharpCodeWriter writer,
+            protected override CSharpCodeVisitor CreateCSharpCodeVisitor(
-                                                                         [NotNull] CodeBuilderContext context)
+                CSharpCodeWriter writer,
+                CodeBuilderContext context)
             {
                 var bodyVisitor = base.CreateCSharpCodeVisitor(writer, context);
 
@@ -83,11 +84,12 @@ namespace Microsoft.AspNet.Razor.Test.Generator
 
         private class CustomTagHelperAttributeCodeRenderer : TagHelperAttributeValueCodeRenderer
         {
-            public override void RenderAttributeValue([NotNull] TagHelperAttributeDescriptor attributeInfo,
+            public override void RenderAttributeValue(
-                                                      [NotNull] CSharpCodeWriter writer,
+                TagHelperAttributeDescriptor attributeInfo,
-                                                      [NotNull] CodeBuilderContext context,
+                CSharpCodeWriter writer,
-                                                      [NotNull] Action<CSharpCodeWriter> renderAttributeValue,
+                CodeBuilderContext context,
-                                                      bool complexValue)
+                Action<CSharpCodeWriter> renderAttributeValue,
+                bool complexValue)
             {
                 writer.Write("**From custom attribute code renderer**: ");