Re-enable netcoreapp1.1 tests (part 2)

fugaku · Feb 16, 2017 · 075771a · 075771a
1 parent f3a0ee5
commit 075771a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/build/repo.props b/build/repo.props
diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj b/test/Microsoft.CodeAnalysis.Razor.Test/Microsoft.CodeAnalysis.Razor.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -11,6 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="TestFiles\**\*" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />

diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/TestCompilation.cs b/test/Microsoft.CodeAnalysis.Razor.Test/TestCompilation.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -23,13 +24,13 @@ public static Compilation Create(SyntaxTree syntaxTree = null)
                 syntaxTrees = new[] { syntaxTree };
             }
 
-            var assemblyName = new AssemblyName(typeof(TestCompilation).GetTypeInfo().Assembly.GetName().Name);
-            var dependencyContext = DependencyContext.Load(Assembly.Load(assemblyName));
+            var currentAssembly = typeof(TestCompilation).GetTypeInfo().Assembly;
+            var dependencyContext = DependencyContext.Load(currentAssembly);
 
             var references = dependencyContext.CompileLibraries.SelectMany(l => l.ResolveReferencePaths())
                 .Select(assemblyPath => MetadataReference.CreateFromFile(assemblyPath));
-
             var compilation = CSharpCompilation.Create("TestAssembly", syntaxTrees, references);
+
             EnsureValidCompilation(compilation);
 
             return compilation;

diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/xunit.runner.json b/test/Microsoft.CodeAnalysis.Razor.Test/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}