Merge pull request #738 from vancem/UpdateOSExtensions

Update OSExtentions
microsoft · Sep 6, 2018 · 4915659 · 4915659
2 parents 09e5cfc + ddf07b7
commit 4915659
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
+<Project> 
 
   <PropertyGroup>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
@@ -29,7 +29,7 @@
   <!-- versions of dependencies that more than one project use -->
   <PropertyGroup>
     <PerfViewSupportFilesVersion>1.0.7</PerfViewSupportFilesVersion>
-    <MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>1.0.15</MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>
+    <MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>1.0.16</MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>
     <MicrosoftDiagnosticsRuntimeVersion>0.8.31-beta</MicrosoftDiagnosticsRuntimeVersion>
     <XunitVersion>2.3.0</XunitVersion>
     <XunitRunnerVisualstudioVersion>2.3.0</XunitRunnerVisualstudioVersion>

diff --git a/src/NugetSupportFiles/Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles.Populate.bat b/src/NugetSupportFiles/Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles.Populate.bat
@@ -1,13 +1,21 @@
 REM copies from an existing build to a nuget package creation area (so that *.MakeNuget.bat works)
 REM
 REM *** This is mostly a template for doing the copy.      ****  
-REM *** Most likey you want this to be the current version ****
+REM *** Most likely you want this to be the current version ****
 REM *** PLEASE MODIFY THE VERSION NUMBER TO BE CURRENT!    ****
-xcopy /s /Y %HOMEDRIVE%%HOMEPATH%\.nuget\packages\Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\1.0.14\*.dll Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles
+@if "%1" == "" (
+    echo Error Must specify the last component of the version number of MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion from Directory.Build.props
+	exit /b 1
+)
+xcopy /s /Y %HOMEDRIVE%%HOMEPATH%\.nuget\packages\Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\1.0.%1\*.dll Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles
+@if NOT "%ERRORLEVEL%" == "0" (
+    echo *****  Bad Version Number %1.  ******
+	exit /b 1
+)
 
-REM Overwrite OSExtensions.dll with the latest built versions.
-xcopy /s /Y ..\OSExtensions\bin\Release\net45\OSExtensions.dll Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\lib\net45
-xcopy /s /Y ..\OSExtensions\bin\Release\netstandard1.6\OSExtensions.dll Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\lib\netstandard1.6
+REM Overwrite OSExtensions.dll with the latest built versions.  However you want the signed versions of these 
+@REM Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\lib\net45
+@REM Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles\lib\netstandard1.6
 
 @REM These are the binary files we need from somewhere to for the support package
 @REM lib\native\amd64\KernelTraceControl.dll

diff --git a/...cing.TraceEvent.SupportFiles/Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles.nuspec b/...cing.TraceEvent.SupportFiles/Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata minClientVersion="2.5">
     <id>Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles</id>
-    <version>1.0.14</version>
+    <version>1.0.16</version>
     <title>Non-Source files needed to Build TraceEvent</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>

diff --git a/src/NugetSupportFiles/PerfView.SupportFiles.Populate.bat b/src/NugetSupportFiles/PerfView.SupportFiles.Populate.bat
@@ -1,11 +1,19 @@
 REM copies from an existing build to a nuget package creation area (so that *.MakeNuget.bat works)
 REM
 REM *** This is mostly a template for doing the copy.      ****  
-REM *** Most likey you want this to be the current version ****
+REM *** Most likely you want this to be the current version ****
 REM *** PLEASE MODIFY THE VERSION NUMBER TO BE CURRENT!    ****
 REM 
-xcopy /s %HOMEDRIVE%%HOMEPATH%\.nuget\packages\PerfView.SupportFiles\1.0.6\*.dll PerfView.SupportFiles
-xcopy /s %HOMEDRIVE%%HOMEPATH%\.nuget\packages\PerfView.SupportFiles\1.0.6\*.exe PerfView.SupportFiles
+@if "%1" == "" (
+    echo Error Must specify the last component of the version number of PerfViewSupportFilesVersion from Directory.Build.props
+	exit /b 1
+)
+xcopy /s %HOMEDRIVE%%HOMEPATH%\.nuget\packages\PerfView.SupportFiles\1.0.%1\*.dll PerfView.SupportFiles
+@if NOT "%ERRORLEVEL%" == "0" (
+    echo *****  Bad Version Number %1.  ******
+	exit /b 1
+)
+xcopy /s %HOMEDRIVE%%HOMEPATH%\.nuget\packages\PerfView.SupportFiles\1.0.%1\*.exe PerfView.SupportFiles
 
 @REM These are the binary files we need from somewhere to for the support package
 @REM lib\native\x86\DiagnosticsHub.Packaging.dll