From 11af72a9c6387aa21b0e1dff18a64d903f986be8 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 3 Oct 2015 15:44:39 -0700
Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

---
 .../CodeAnalysisAttributeUtilities.cs                       | 2 +-
 .../project.json                                            | 4 ++--
 .../TagHelpers/DefaultTagHelperContent.cs                   | 4 ++--
 .../TagHelpers/ReadOnlyTagHelperAttributeList.cs            | 2 +-
 .../TagHelpers/RuntimeTypeInfo.cs                           | 2 +-
 .../TagHelpers/TagHelperAttributeList.cs                    | 2 +-
 .../TagHelpers/TagHelperContent.cs                          | 2 +-
 .../TagHelpers/TagHelperScopeManager.cs                     | 2 +-
 src/Microsoft.AspNet.Razor.Runtime/project.json             | 6 +++---
 .../CaseSensitiveTagHelperDescriptorComparer.cs             | 2 +-
 .../TagHelperAttributeDescriptorComparer.cs                 | 2 +-
 .../TagHelperAttributeDesignTimeDescriptorComparer.cs       | 4 ++--
 .../TagHelperDesignTimeDescriptorComparer.cs                | 4 ++--
 .../Chunks/Generators/AttributeBlockChunkGenerator.cs       | 2 +-
 .../Chunks/Generators/LiteralAttributeChunkGenerator.cs     | 2 +-
 .../CodeGenerators/GeneratedClassContext.cs                 | 2 +-
 src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs    | 2 +-
 .../CodeGenerators/MappingLocation.cs                       | 2 +-
 .../Editor/AutoCompleteEditHandler.cs                       | 2 +-
 .../Editor/ImplicitExpressionEditHandler.cs                 | 2 +-
 src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs       | 2 +-
 .../Parser/TagHelpers/TagHelperBlock.cs                     | 2 +-
 src/Microsoft.AspNet.Razor/RazorError.cs                    | 2 +-
 src/Microsoft.AspNet.Razor/SourceLocation.cs                | 2 +-
 .../TagHelpers/TagHelperDescriptorComparer.cs               | 2 +-
 .../TagHelpers/TypeBasedTagHelperDescriptorComparer.cs      | 2 +-
 src/Microsoft.AspNet.Razor/Text/LocationTagged.cs           | 2 +-
 src/Microsoft.AspNet.Razor/Text/TextChange.cs               | 2 +-
 src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs  | 2 +-
 src/Microsoft.AspNet.Razor/project.json                     | 2 +-
 .../project.json                                            | 4 ++--
 .../TagHelpers/DefaultTagHelperContentTest.cs               | 2 +-
 .../TagHelpers/TagHelperExecutionContextTest.cs             | 2 +-
 .../TagHelpers/TagHelperOutputTest.cs                       | 2 +-
 test/Microsoft.AspNet.Razor.Runtime.Test/project.json       | 4 ++--
 test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs | 2 +-
 .../TagHelpers/TagHelperDirectiveSpanVisitorTest.cs         | 2 +-
 37 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/Microsoft.AspNet.Razor.Runtime.Precompilation/CodeAnalysisAttributeUtilities.cs b/src/Microsoft.AspNet.Razor.Runtime.Precompilation/CodeAnalysisAttributeUtilities.cs
index b27c691e53..803124afec 100644
--- a/src/Microsoft.AspNet.Razor.Runtime.Precompilation/CodeAnalysisAttributeUtilities.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime.Precompilation/project.json b/src/Microsoft.AspNet.Razor.Runtime.Precompilation/project.json
index 79d17c5352..6e13b31ad9 100644
--- a/src/Microsoft.AspNet.Razor.Runtime.Precompilation/project.json
+++ b/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"
         },
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
index 4c93aa29b1..3f05a33920 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
+++ b/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.Framework.WebEncoders;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
index 6cd5eebade..f17df8d389 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs
index 13df3baf0e..59768fa3ab 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
index abfde82719..4a5c4ff9e5 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs
index 4f86f4bd99..55108977e8 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs
index 4b6ebfe35b..ba3228bdaa 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor.Runtime/project.json b/src/Microsoft.AspNet.Razor.Runtime/project.json
index 4a35ed012a..48d23923ea 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/project.json
+++ b/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-*"
     }
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs b/src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
index 90f01e0220..a53987a695 100644
--- a/src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
+++ b/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
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs b/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
index a97d389be8..0658a5e00c 100644
--- a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
+++ b/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
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
index 5fb63ebbcb..5cf3c65982 100644
--- a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
+++ b/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
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
index c9f20181a0..115812c7e6 100644
--- a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
+++ b/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
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs b/src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
index 8d13f17649..9469fb35b1 100644
--- a/src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs b/src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
index 58973e9145..71b1b93ef6 100644
--- a/src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedClassContext.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedClassContext.cs
index e98c288701..71eba9c828 100644
--- a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedClassContext.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs
index 4c23c29444..f8dfc4d1cb 100644
--- a/src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs
index 8f5152b44d..64fa4021ab 100644
--- a/src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs b/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs
index 20269c14bd..115882ec45 100644
--- a/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs
index 056d4d6dc7..16deff101a 100644
--- a/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs b/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs
index b7f62e693e..00a7de7197 100644
--- a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs
index 1ce96ee82d..90ae8ab144 100644
--- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/RazorError.cs b/src/Microsoft.AspNet.Razor/RazorError.cs
index f361805f45..d7abc3d4db 100644
--- a/src/Microsoft.AspNet.Razor/RazorError.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/SourceLocation.cs b/src/Microsoft.AspNet.Razor/SourceLocation.cs
index b18df9610e..dfe1ab6175 100644
--- a/src/Microsoft.AspNet.Razor/SourceLocation.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDescriptorComparer.cs b/src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDescriptorComparer.cs
index f60e659494..4d09b48bce 100644
--- a/src/Microsoft.AspNet.Razor/TagHelpers/TagHelperDescriptorComparer.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs b/src/Microsoft.AspNet.Razor/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
index cb6016ece3..265121463f 100644
--- a/src/Microsoft.AspNet.Razor/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Text/LocationTagged.cs b/src/Microsoft.AspNet.Razor/Text/LocationTagged.cs
index 8cbd64292d..5156b7a212 100644
--- a/src/Microsoft.AspNet.Razor/Text/LocationTagged.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Text/TextChange.cs b/src/Microsoft.AspNet.Razor/Text/TextChange.cs
index 2671c9c003..ec432b6a4b 100644
--- a/src/Microsoft.AspNet.Razor/Text/TextChange.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs b/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs
index 04b713b86c..fca7684a2e 100644
--- a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs
+++ b/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
 {
diff --git a/src/Microsoft.AspNet.Razor/project.json b/src/Microsoft.AspNet.Razor/project.json
index cd0a52b3c5..2259728e79 100644
--- a/src/Microsoft.AspNet.Razor/project.json
+++ b/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-*"
     }
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json
index 0e06470e22..ec6f91d869 100644
--- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json
+++ b/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-*"
         }
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
index bdf2a1f00d..b82ef53a0b 100644
--- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
+++ b/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
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs
index 1fdbb1d69b..b283a4dcfd 100644
--- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs
+++ b/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
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
index 133f3b1ceb..eda081dd85 100644
--- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
+++ b/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
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json b/test/Microsoft.AspNet.Razor.Runtime.Test/project.json
index 162fa35400..5633b9860c 100644
--- a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json
+++ b/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": {
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs
index 2c686a06dd..50ac8500ef 100644
--- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs
+++ b/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
 {
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
index 632a11ecf8..f0565164b6 100644
--- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
+++ b/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