Merge pull request #1916 from venkat-raman251/newBranch

System.Text.Encoding.Extension changes + minor refactoring in System.Reflection.TypeExtensions

Author: venkat-raman251

src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.CoreCLR.csproj

@@ -25,4 +25,4 @@
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>

src/System.Reflection.TypeExtensions/src/project.json

@@ -5,4 +5,4 @@
   "frameworks": {
     "dnxcore50": {}
   }
-}
+}

src/System.Reflection.TypeExtensions/tests/Assembly/AssemblyExtensionTests.cs

@@ -23,7 +23,7 @@ public void GetExportedTypesTest()
         public void GetModulesTest()
         {
             Assembly executingAssembly = this.GetType().GetTypeInfo().Assembly;
-            Assert.True(executingAssembly.GetModules().Length == 1);
+            Assert.Equal(1, executingAssembly.GetModules().Length);
         }
 
         [Fact]

src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj

@@ -84,4 +84,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>

src/System.Reflection.TypeExtensions/tests/project.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "System.Collections": "4.0.10-beta-*",
     "System.Diagnostics.Debug": "4.0.10-beta-*",
     "System.Linq": "4.0.0-beta-*",
     "System.Reflection": "4.0.10-beta-*",
@@ -21,4 +20,4 @@
   "frameworks": {
     "dnxcore50": {}
   }
-}
+}

src/System.Reflection.TypeExtensions/tests/project.lock.json

@@ -597,7 +597,6 @@
   },
   "projectFileDependencyGroups": {
     "": [
-      "System.Collections >= 4.0.10-beta-*",
       "System.Diagnostics.Debug >= 4.0.10-beta-*",
       "System.Linq >= 4.0.0-beta-*",
       "System.Reflection >= 4.0.10-beta-*",

src/System.Text.Encoding.Extensions/Encoding.Extensions.Tests.sln renamed to src/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22609.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Encoding.Extensions.Tests", "tests\4.0.10.0\Encoding\Encoding.Extensions.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.Extensions.Tests", "tests\System.Text.Encoding.Extensions.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution