diff --git a/build/repo.targets b/build/repo.targets
new file mode 100644
index 0000000000..ba1cb89555
--- /dev/null
+++ b/build/repo.targets
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <AutobahnReportDir>$(ArtifactsDir)autobahnreports\</AutobahnReportDir>
+  </PropertyGroup>
+
+  <Target Name="SetReportDirectory" BeforeTargets="Test">
+    <SetEnvironmentVariable Variable="AUTOBAHN_SUITES_REPORT_DIR" Value="$(AutobahnReportDir)" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
deleted file mode 100644
index ecfd6668cc..0000000000
--- a/makefile.shade
+++ /dev/null
@@ -1,15 +0,0 @@
-use namespace="System.IO"
-
-var VERSION='0.1'
-var FULL_VERSION='0.1'
-var AUTHORS='Microsoft'
-
-use-standard-lifecycle
-k-standard-goals
-
-var AUTOBAHN_REPORTS_DIR='${Path.Combine(Directory.GetCurrentDirectory(), "artifacts", "autobahnreports")}'
-
-#set-autobahn-report-dir target='initialize'
-    @{
-        E("AUTOBAHN_SUITES_REPORT_DIR", AUTOBAHN_REPORTS_DIR);
-    }
diff --git a/test/AutobahnTestApp/AutobahnTestApp.csproj b/test/AutobahnTestApp/AutobahnTestApp.csproj
index 123ce068e5..869b258cd5 100644
--- a/test/AutobahnTestApp/AutobahnTestApp.csproj
+++ b/test/AutobahnTestApp/AutobahnTestApp.csproj
@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  
   <Import Project="..\..\build\common.props" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
+
   <ItemGroup>
     <Content Include="TestResources\testCert.pfx" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-    <Content Update="web.config" CopyToPublishDirectory="PreserveNewest"/>
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.WebSockets\Microsoft.AspNetCore.WebSockets.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.2.0-*" />
@@ -21,4 +25,5 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj b/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
index 1ae595028c..ee981e14c3 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
+++ b/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
@@ -3,7 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
     <!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>