From 9c4970b824f14fd69d553e83035050c2d634cabe Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Fri, 20 Sep 2019 17:30:16 -0700 Subject: [PATCH] Verbose logging for symbol publish (#491) Change to stable version (no preview tag) Fix product version string and update docs Remove source link disabling --- .vsts-dotnet.yml | 2 +- Directory.Build.props | 7 ------- documentation/dotnet-counters-instructions.md | 2 +- documentation/dotnet-dump-instructions.md | 6 +++--- documentation/dotnet-trace-instructions.md | 4 ++-- documentation/installing-sos-instructions.md | 10 +++++----- .../installing-sos-windows-instructions.md | 6 +++--- .../tutorial/installing_the_diagnostics_tools.md | 6 +++--- eng/Build-Native.cmd | 16 ++++++++++++++-- ...VersionFile.proj => CreateVersionFile.csproj} | 0 eng/Versions.props | 2 +- eng/build-native.sh | 5 ++++- 12 files changed, 37 insertions(+), 29 deletions(-) rename eng/{CreateVersionFile.proj => CreateVersionFile.csproj} (100%) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index caba502822..f57bfcab99 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -322,7 +322,7 @@ phases: displayName: Publish Symbols inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release -verbosity detailed /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping' diff --git a/Directory.Build.props b/Directory.Build.props index e5131e25e1..0e80695c3d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,11 +18,4 @@ MIT true - - - - false - false - false - diff --git a/documentation/dotnet-counters-instructions.md b/documentation/dotnet-counters-instructions.md index 57d3c75c0b..7e41146064 100644 --- a/documentation/dotnet-counters-instructions.md +++ b/documentation/dotnet-counters-instructions.md @@ -9,7 +9,7 @@ dotnet-counters is a performance monitoring tool for ad-hoc health monitoring or ## Install dotnet-counters ``` -dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1 +dotnet tool install --global dotnet-counters ``` diff --git a/documentation/dotnet-dump-instructions.md b/documentation/dotnet-dump-instructions.md index 678a1572dc..5e2ed61dfd 100644 --- a/documentation/dotnet-dump-instructions.md +++ b/documentation/dotnet-dump-instructions.md @@ -9,9 +9,9 @@ Currently not supported on macOS. The first step is to install the dotnet-dump CLI global tool. This requires at least the 2.1 or greater .NET Core SDK to be installed. If you see the error message `Tool 'dotnet-dump' is already installed`, you will need to uninstall the global tool (see below). - $ dotnet tool install -g dotnet-dump --version 3.0.0-preview9.19454.1 + $ dotnet tool install -g dotnet-dump You can invoke the tool using the following command: dotnet-dump - Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully installed. + Tool 'dotnet-dump' (version '3.0.0.47001') was successfully installed. If this is the first global tool installed or you get message `Could not execute because the specified command or file was not found.` you need to add `$HOME/.dotnet/tools` to your path. @@ -118,4 +118,4 @@ This command on Microsoft .NET Core SDK Linux docker images can throw `Unhandled ## Uninstalling dotnet-dump $ dotnet tool uninstall -g dotnet-dump - Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully uninstalled. + Tool 'dotnet-dump' (version '3.0.0.47001') was successfully uninstalled. diff --git a/documentation/dotnet-trace-instructions.md b/documentation/dotnet-trace-instructions.md index 938086be50..c652a3f9ac 100644 --- a/documentation/dotnet-trace-instructions.md +++ b/documentation/dotnet-trace-instructions.md @@ -7,9 +7,9 @@ The dotnet-trace tool is a cross-platform CLI global tool that enables the colle The first step is to install the dotnet-trace CLI global tool. ```cmd -$ dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1 +$ dotnet tool install --global dotnet-trace You can invoke the tool using the following command: dotnet-trace -Tool 'dotnet-trace' (version '3.0.0-preview9.19454.1') was successfully installed. +Tool 'dotnet-trace' (version '3.0.0.47001') was successfully installed. ``` ## Using dotnet-trace diff --git a/documentation/installing-sos-instructions.md b/documentation/installing-sos-instructions.md index e5576ab62b..614dc5148c 100644 --- a/documentation/installing-sos-instructions.md +++ b/documentation/installing-sos-instructions.md @@ -3,14 +3,14 @@ Installing SOS on Linux and MacOS The first step is to install the dotnet-sos CLI global tool. This requires at least the 2.1 or greater .NET Core SDK to be installed. If you see the error message `Tool 'dotnet-sos' is already installed`, you will need to uninstall the global tool (see below). - $ dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1 + $ dotnet tool install -g dotnet-sos You can invoke the tool using the following command: dotnet-sos - Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed. + Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed. The next step is use this global tool to install SOS. $ dotnet-sos install - Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0-preview9.19454.1/dotnet-sos/3.0.0-preview9.19454.1/tools/netcoreapp2.1/any/linux-x64 + Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0.47001/dotnet-sos/3.0.0.47001/tools/netcoreapp2.1/any/linux-x64 Creating installation directory... Copying files... Updating existing /home/mikem/.lldbinit file - LLDB will load SOS automatically at startup @@ -72,7 +72,7 @@ Now any time you run lldb, SOS will automatically be loaded and the symbol downl The installer needs to be run again: $ dotnet-sos install - Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0-preview9.19454.1/dotnet-sos/3.0.0-preview9.19454.1/tools/netcoreapp2.1/any/linux-x64 + Installing SOS to /home/mikem/.dotnet/sos from /home/mikem/.dotnet/tools/.store/dotnet-sos/3.0.0.47001/dotnet-sos/3.0.0.47001/tools/netcoreapp2.1/any/linux-x64 Installing over existing installation... Creating installation directory... Copying files... @@ -92,4 +92,4 @@ To uninstall and remove the lldb configuration run this command: To remove the SOS installer global tool: $ dotnet tool uninstall -g dotnet-sos - Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully uninstalled. + Tool 'dotnet-sos' (version '3.0.0.47001') was successfully uninstalled. diff --git a/documentation/installing-sos-windows-instructions.md b/documentation/installing-sos-windows-instructions.md index 39764429b7..7844031bd3 100644 --- a/documentation/installing-sos-windows-instructions.md +++ b/documentation/installing-sos-windows-instructions.md @@ -47,14 +47,14 @@ SOS will automatically be loaded from the internal Microsoft extension gallery. It is recommended that you update to the newer versions of the Windows debugger, but you can still use the latest SOS with older Windows debuggers by using the dotnet-sos CLI global tool to install. It is not as convenient. You may have to ".unload" the SOS that is loaded from the "runtime" directory. - C:\Users\mikem>dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1 + C:\Users\mikem>dotnet tool install -g dotnet-sos You can invoke the tool using the following command: dotnet-sos - Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed. + Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed. Run the installer: C:\Users\mikem>dotnet-sos install - Installing SOS to C:\Users\mikem\.dotnet\sos from C:\Users\mikem\.dotnet\tools\.store\dotnet-sos\3.0.0-preview9.19454.1\dotnet-sos\3.0.0-preview9.19454.1\tools\netcoreapp2.1\any\win-x64 + Installing SOS to C:\Users\mikem\.dotnet\sos from C:\Users\mikem\.dotnet\tools\.store\dotnet-sos\3.0.0.47001\dotnet-sos\3.0.0.47001\tools\netcoreapp2.1\any\win-x64 Creating installation directory... Copying files... Execute '.load C:\Users\mikem\.dotnet\sos\sos.dll' to load SOS in your Windows debugger. diff --git a/documentation/tutorial/installing_the_diagnostics_tools.md b/documentation/tutorial/installing_the_diagnostics_tools.md index aa8d72e088..e3efd27750 100644 --- a/documentation/tutorial/installing_the_diagnostics_tools.md +++ b/documentation/tutorial/installing_the_diagnostics_tools.md @@ -6,7 +6,7 @@ Depending on the diagnostics scenario you will use one or more of the tools belo In the .NET full/Windows world, we have a myriad of performance counters that can be used to triage and diagnose production issues. For .Net core we have a similar and cross platform story centered around a tool called dotnet-counters. To install the tool, run the following command: > ```bash -> dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1 +> dotnet tool install --global dotnet-counters > ``` @@ -14,7 +14,7 @@ In the .NET full/Windows world, we have a myriad of performance counters that ca .NET core includes what is called the 'EventPipe' through which diagnostics data is exposed. The dotnet-trace tool allows you to consume interesting profiling data from your app that can help in scenarios where you need to root cause apps running slow. To install the tool, run the following command: > ```bash -> dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1 +> dotnet tool install --global dotnet-trace > ``` @@ -22,7 +22,7 @@ In the .NET full/Windows world, we have a myriad of performance counters that ca In order to generate core dumps for .net core apps, you can use the dotnet-dump tool. To install the tool, run the following command: > ```bash -> dotnet tool install --global dotnet-dump --version 3.0.0-preview9.19454.1 +> dotnet tool install --global dotnet-dump > ``` diff --git a/eng/Build-Native.cmd b/eng/Build-Native.cmd index 690ac76337..957cb56693 100644 --- a/eng/Build-Native.cmd +++ b/eng/Build-Native.cmd @@ -196,8 +196,14 @@ if /i %__BuildCrossArch% EQU 1 ( if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%" echo Generating Version Header + set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog" + "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% + if not !errorlevel! == 0 ( + echo Generate Version Restore FAILED + exit /b 1 + ) set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog" - "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.proj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__CrossCompIntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% + "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__CrossCompIntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo Generate Version Header FAILED exit /b 1 @@ -274,8 +280,14 @@ if %__Build% EQU 1 ( ) echo Generating Version Header + set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog" + "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% + if not !errorlevel! == 0 ( + echo Generate Version Restore FAILED + exit /b 1 + ) set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog" - "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.proj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__IntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% + "%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionLog! /t:GenerateVersionFiles /p:FileVersionFile=%__RootBinDir%\bin\FileVersion.txt /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile=%__IntermediatesDir%\_version.h /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo Generate Version Header FAILED exit /b 1 diff --git a/eng/CreateVersionFile.proj b/eng/CreateVersionFile.csproj similarity index 100% rename from eng/CreateVersionFile.proj rename to eng/CreateVersionFile.csproj diff --git a/eng/Versions.props b/eng/Versions.props index 9278c05a14..b690dcec44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ https://github.com/dotnet/diagnostics - rc1 + 3.0.0 true true diff --git a/eng/build-native.sh b/eng/build-native.sh index 5857ceab0b..ea9b450717 100755 --- a/eng/build-native.sh +++ b/eng/build-native.sh @@ -412,8 +412,11 @@ fi if [ $__Build == true ]; then if [[ $__CI == true ]]; then echo "Generating Version Source File" + __GenerateVersionRestoreLog="$__LogDir/GenerateVersionRestore.binlog" + $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.csproj /v:$__Verbosity /bl:$__GenerateVersionRestoreLog /t:Restore /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs + __GenerateVersionLog="$__LogDir/GenerateVersion.binlog" - $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.proj /v:$__Verbosity /bl:$__GenerateVersionLog /t:GenerateVersionFiles /p:GenerateVersionSourceFile=true /p:NativeVersionSourceFile="$__IntermediatesDir/version.cpp" /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs + $__DotNetCli msbuild $__ProjectRoot/eng/CreateVersionFile.csproj /v:$__Verbosity /bl:$__GenerateVersionLog /t:GenerateVersionFiles /p:GenerateVersionSourceFile=true /p:NativeVersionSourceFile="$__IntermediatesDir/version.cpp" /p:Configuration="$__BuildType" /p:Platform="$__BuildArch" $__UnprocessedBuildArgs if [ $? != 0 ]; then echo "Generating Version Source File FAILED" exit 1