Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

src/Microsoft.AspNet.Razor.Runtime.Precompilation/CodeAnalysisAttributeUtilities.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using Microsoft.CodeAnalysis;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Runtime.Precompilation
 {

src/Microsoft.AspNet.Razor.Runtime.Precompilation/project.json

@@ -9,11 +9,11 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.PropertyActivator.Sources": {
+        "Microsoft.Extensions.PropertyActivator.Sources": {
             "version": "1.0.0-*",
             "type": "build"
         },
-        "Microsoft.Framework.PropertyHelper.Sources": {
+        "Microsoft.Extensions.PropertyHelper.Sources": {
             "version": "1.0.0-*",
             "type": "build"
         },

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs

@@ -6,8 +6,8 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using Microsoft.AspNet.Html.Abstractions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 {

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs

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

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 {

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs

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

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNet.Html.Abstractions;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 {

src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 {

src/Microsoft.AspNet.Razor.Runtime/project.json

@@ -8,15 +8,15 @@
   "dependencies": {
     "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
     "Microsoft.AspNet.Razor": "4.0.0-*",
-    "Microsoft.Framework.BufferedHtmlContent.Sources": {
+    "Microsoft.Extensions.BufferedHtmlContent.Sources": {
       "type": "build",
       "version": "1.0.0-*"
     },
-    "Microsoft.Framework.ClosedGenericMatcher.Sources": {
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
       "type": "build",
       "version": "1.0.0-*"
     },
-    "Microsoft.Framework.CopyOnWriteDictionary.Sources": {
+    "Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
       "type": "build",
       "version": "1.0.0-*"
     }

src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Test.Internal

src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Test.Internal

src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs

@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Test.Internal

src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs

@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Test.Internal

src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs

@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Chunks.Generators
 {

src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Chunks.Generators
 {

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

@@ -2,7 +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;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.CodeGenerators
 {

src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs

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

src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs

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

src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs

@@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNet.Razor.Editor;
 using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer.Symbols;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
 {

src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs

@@ -12,7 +12,7 @@ using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Text;
 using Microsoft.AspNet.Razor.Tokenizer.Symbols;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Editor
 {

src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs

@@ -8,7 +8,7 @@ using System.Globalization;
 using System.Linq;
 using Microsoft.AspNet.Razor.Chunks.Generators;
 using Microsoft.AspNet.Razor.Text;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
 {

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

@@ -8,7 +8,7 @@ using System.Linq;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Parser.TagHelpers
 {

src/Microsoft.AspNet.Razor/RazorError.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

src/Microsoft.AspNet.Razor/SourceLocation.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 using Microsoft.AspNet.Razor.Text;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor
 {

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

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

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

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

src/Microsoft.AspNet.Razor/Text/LocationTagged.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Text
 {

src/Microsoft.AspNet.Razor/Text/TextChange.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Text;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Text
 {

src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
 {

src/Microsoft.AspNet.Razor/project.json

@@ -6,7 +6,7 @@
     "url": "git://github.com/aspnet/razor"
   },
   "dependencies": {
-    "Microsoft.Framework.HashCodeCombiner.Sources": {
+    "Microsoft.Extensions.HashCodeCombiner.Sources": {
       "type": "build",
       "version": "1.0.0-*"
     }

test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json

@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0",
     "dependencies": {
         "Microsoft.AspNet.Razor.Runtime.Precompilation.Files": "1.0.0-*",
@@ -8,7 +8,7 @@
             "type": "build"
         },
         "Microsoft.Dnx.Compilation.CSharp.Common":  "1.0.0-*",
-        "Microsoft.Framework.HashCodeCombiner.Sources": {
+        "Microsoft.Extensions.HashCodeCombiner.Sources": {
             "type": "build",
             "version": "1.0.0-*"
         }

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

@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.WebEncoders.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers

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

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Framework.WebEncoders.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers

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

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Framework.WebEncoders.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers

test/Microsoft.AspNet.Razor.Runtime.Test/project.json

@@ -7,11 +7,11 @@
       "type": "build"
     },
     "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Framework.HashCodeCombiner.Sources": {
+    "Microsoft.Extensions.HashCodeCombiner.Sources": {
       "type": "build",
       "version": "1.0.0-*"
     },
-    "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*",
+    "Microsoft.Extensions.WebEncoders.Testing": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {

test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs

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

test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNet.Razor.Parser;
 using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.AspNet.Razor.Parser.TagHelpers;
 using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 #if !DNXCORE50
 using Moq;
 #endif