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

@@ -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'

Directory.Build.props

@@ -18,11 +18,4 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <EnableSourceControlManagerQueries>true</EnableSourceControlManagerQueries>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(OS)' == 'Unix'">
-    <!-- Disable source link until issue https://github.com/dotnet/roslyn/issues/29289#issuecomment-413294637 is fixed -->
-    <EnableSourceLink>false</EnableSourceLink>
-    <DeterministicSourcePaths>false</DeterministicSourcePaths>
-    <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
-  </PropertyGroup>
 </Project>

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
 ```
 
 

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.

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

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.

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.

documentation/tutorial/installing_the_diagnostics_tools.md

@@ -6,23 +6,23 @@ 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
 > ```
 
 
 ### dotnet-trace
 .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 
 > ```
 
 
 ### dotnet-dump
 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
 > ```
 
 

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

eng/Versions.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
-    <PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel></PreReleaseVersionLabel>
     <VersionPrefix>3.0.0</VersionPrefix>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

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