diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2019-03-29 21:51:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 21:51:39 -0400 |
| commit | 57ea93ab397ac2b41112cd682aa749a97e2e5198 (patch) | |
| tree | 7cf62ba24f8694e1da581e8e878b7a8e78fe5b42 | |
| parent | 79b2ed74655a840c482b58c7eceaf96df20fa5c5 (diff) | |
| download | coreclr-57ea93ab397ac2b41112cd682aa749a97e2e5198.tar.gz coreclr-57ea93ab397ac2b41112cd682aa749a97e2e5198.tar.bz2 coreclr-57ea93ab397ac2b41112cd682aa749a97e2e5198.zip | |
Clean up AssemblyLoadContext30Extensions test (#23581)
Build test against corefx ref facade
Enable Assembly.Load(byte[], ...) test
| -rw-r--r-- | tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.cs | 6 | ||||
| -rw-r--r-- | tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.csproj | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.cs b/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.cs index 2d2a9d8c5e..165fa54e56 100644 --- a/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.cs +++ b/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.cs @@ -6,8 +6,6 @@ using System.Reflection; using System.Runtime.Loader; using System.IO; -using Console = Internal.Console; - namespace My { public class CustomAssemblyLoadContext : AssemblyLoadContext @@ -119,7 +117,6 @@ public class Program public static void AssemblyLoadByteArrayName() { -#if ReadAllBytes // System.IO.File.ReadAllBytes is not found when ReferenceSystemPrivateCoreLib is true try { Console.WriteLine("AssemblyLoadByteArrayName()"); @@ -138,7 +135,7 @@ public class Program Assert(alc.GetType().ToString() == "System.Runtime.Loader.IndividualAssemblyLoadContext"); Console.WriteLine(alc.ToString()); - Assert(alc.ToString().Contains("\"Default")); + Assert(alc.ToString().Contains("\"Assembly.Load(byte[], ...)\"")); Assert(alc.ToString().Contains("\" System.Runtime.Loader.IndividualAssemblyLoadContext")); Assert(alc.ToString().Contains(" #")); } @@ -146,7 +143,6 @@ public class Program { Assert(false, e.ToString()); } -#endif } public static void CustomWOName() diff --git a/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.csproj b/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.csproj index 5ef86a19ca..d9cef87c60 100644 --- a/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.csproj +++ b/tests/src/Loader/AssemblyLoadContext30Extensions/AssemblyLoadContext30Extensions.csproj @@ -10,7 +10,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |