From 90b9a1d56d243de9fb29c84b921a23f63bb4e525 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cithomas@microsoft.com>
Date: Thu, 13 Jul 2017 17:30:24 -0700
Subject: [PATCH] Added assembly redirects for diag source. Added clean.cmd
 Removed clearing nuget from dirs.proj

---
 clean.cmd                                         |  3 +++
 dirs.proj                                         |  2 +-
 test/EmptyApp.FunctionalTests/App.config          | 15 +++++++++++++++
 .../EmptyApp.FunctionalTests.csproj               |  9 ++++++++-
 test/MVCFramework45.FunctionalTests/App.config    | 15 +++++++++++++++
 .../MVCFramework45.FunctionalTests.csproj         |  6 +++++-
 .../App.config                                    | 15 +++++++++++++++
 ...ft.ApplicationInsights.AspNetCore.Tests.csproj |  9 ++++++++-
 .../WebApiShimFw46.FunctionalTests.csproj         |  2 +-
 9 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 clean.cmd
 create mode 100644 test/EmptyApp.FunctionalTests/App.config
 create mode 100644 test/MVCFramework45.FunctionalTests/App.config
 create mode 100644 test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config

diff --git a/clean.cmd b/clean.cmd
new file mode 100644
index 0000000..dc08191
--- /dev/null
+++ b/clean.cmd
@@ -0,0 +1,3 @@
+rmdir /q/s %TEMP%\VisualStudioTestExplorerExtensions\
+rmdir /S /Q ..\bin
+rmdir /S /Q ..\obj
\ No newline at end of file
diff --git a/dirs.proj b/dirs.proj
index 8d42ad4..ccca898 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -168,7 +168,7 @@
         <Exec Command=".\nuget.exe locals all -clear" ContinueOnError="ErrorAndStop" />
     </Target>
     
-    <Target Name="Build" DependsOnTargets="CheckBuildParameters;DownloadCLI;ClearNugetCache">
+    <Target Name="Build" DependsOnTargets="CheckBuildParameters;DownloadCLI">
         <Exec Command='"$(CliToolsPath)\dotnet.exe" --version' />        
         <Exec Command='"nuget.exe" restore' ContinueOnError="ErrorAndStop" />
         <Exec Command='"$(CliToolsPath)\dotnet.exe" build $(ProjectToBuild) -c $(Configuration)' ContinueOnError="ErrorAndStop" />
diff --git a/test/EmptyApp.FunctionalTests/App.config b/test/EmptyApp.FunctionalTests/App.config
new file mode 100644
index 0000000..380c07b
--- /dev/null
+++ b/test/EmptyApp.FunctionalTests/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.1.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj
index 5b7bcaa..da2c91b 100644
--- a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj
+++ b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
 	<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
     <DelaySign>true</DelaySign>
     <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -32,4 +32,11 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Generator>SettingsSingleFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/test/MVCFramework45.FunctionalTests/App.config b/test/MVCFramework45.FunctionalTests/App.config
new file mode 100644
index 0000000..380c07b
--- /dev/null
+++ b/test/MVCFramework45.FunctionalTests/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.1.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj b/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj
index 7518483..6be2617 100644
--- a/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj
+++ b/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
 	<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
     <DelaySign>true</DelaySign>
     <PreserveCompilationContext>true</PreserveCompilationContext>
@@ -20,6 +20,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Generator>SettingsSingleFileGenerator</Generator>
+    </None>
     <None Update="appsettings.json;web.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config
new file mode 100644
index 0000000..380c07b
--- /dev/null
+++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.0.1.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
index 0c15220..0acc2b4 100644
--- a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
+++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
     <DelaySign>true</DelaySign>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Microsoft.ApplicationInsights.AspNetCore.Tests</AssemblyName>
@@ -44,4 +44,11 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <Generator>SettingsSingleFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj b/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj
index e46d9b0..5dda920 100644
--- a/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj
+++ b/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
 	<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
     <DelaySign>true</DelaySign>
     <PreserveCompilationContext>true</PreserveCompilationContext>