Merge pull request #745 from vancem/KerneTraceControlFix

Fix dev-time load failure loading KernelTraceControl.
microsoft · Sep 13, 2018 · 7806ecc · 7806ecc
2 parents f2f96b2 + 2b922a3
commit 7806ecc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,8 +22,8 @@
 
   <PropertyGroup>
     <!-- These are the versions of the things we are CREATING in this repository -->
-    <PerfViewVersion>2.0.23</PerfViewVersion>
-    <TraceEventVersion>2.0.23</TraceEventVersion>
+    <PerfViewVersion>2.0.25</PerfViewVersion>
+    <TraceEventVersion>2.0.25</TraceEventVersion>
   </PropertyGroup>
 
   <!-- versions of dependencies that more than one project use -->

diff --git a/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props b/src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props
@@ -28,7 +28,10 @@
     </None>
 
     <!-- There are no static references to these so I need to copy them explicitly.  
-         These are both COM interop assemblies so they are the same for all targets, I pick netstandard1.6 pretty arbitraily -->
+         The first two COM interop assemblies so they are the same for all targets, I pick netstandard1.6 pretty arbitraily 
+         OSExtensions is also the same for all targets.  It needs to be copied for the dev-time case since in that case it runs the DLLs from the .nuget cache
+         by default, and OSExtensions needs to be in the right relative location with respect to the native DLLs (since it loads them via relative path).   
+      -->
     <None Condition="Exists('$(MSBuildThisFileDirectory)..\lib\netstandard1.6\TraceReloggerLib.dll')" Include="$(MSBuildThisFileDirectory)..\lib\netstandard1.6\TraceReloggerLib.dll">
       <Link>TraceReloggerLib.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -39,5 +42,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
     </None>
+    <None Condition="Exists('$(MSBuildThisFileDirectory)..\lib\netstandard1.6\OSExtensions.dll')" Include="$(MSBuildThisFileDirectory)..\lib\netstandard1.6\OSExtensions.dll">
+      <Link>OsExtensions.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </None>
   </ItemGroup>
 </Project>