WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 9c4970b

Browse files
author
Mike McLaughlin
authored
Verbose logging for symbol publish (#491)
Change to stable version (no preview tag) Fix product version string and update docs Remove source link disabling
1 parent df35aae commit 9c4970b

12 files changed

+37
-29
lines changed

.vsts-dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ phases:
322322
displayName: Publish Symbols
323323
inputs:
324324
filePath: eng\common\sdk-task.ps1
325-
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release
325+
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release -verbosity detailed
326326
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
327327
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
328328
/p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping'

Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,4 @@
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<EnableSourceControlManagerQueries>true</EnableSourceControlManagerQueries>
2020
</PropertyGroup>
21-
22-
<PropertyGroup Condition="'$(OS)' == 'Unix'">
23-
<!-- Disable source link until issue https://github.com/dotnet/roslyn/issues/29289#issuecomment-413294637 is fixed -->
24-
<EnableSourceLink>false</EnableSourceLink>
25-
<DeterministicSourcePaths>false</DeterministicSourcePaths>
26-
<EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
27-
</PropertyGroup>
2821
</Project>

documentation/dotnet-counters-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dotnet-counters is a performance monitoring tool for ad-hoc health monitoring or
99
## Install dotnet-counters
1010

1111
```
12-
dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1
12+
dotnet tool install --global dotnet-counters
1313
```
1414

1515

documentation/dotnet-dump-instructions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Currently not supported on macOS.
99

1010
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).
1111

12-
$ dotnet tool install -g dotnet-dump --version 3.0.0-preview9.19454.1
12+
$ dotnet tool install -g dotnet-dump
1313
You can invoke the tool using the following command: dotnet-dump
14-
Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully installed.
14+
Tool 'dotnet-dump' (version '3.0.0.47001') was successfully installed.
1515

1616
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.
1717

@@ -118,4 +118,4 @@ This command on Microsoft .NET Core SDK Linux docker images can throw `Unhandled
118118
## Uninstalling dotnet-dump
119119

120120
$ dotnet tool uninstall -g dotnet-dump
121-
Tool 'dotnet-dump' (version '3.0.0-preview9.19454.1') was successfully uninstalled.
121+
Tool 'dotnet-dump' (version '3.0.0.47001') was successfully uninstalled.

documentation/dotnet-trace-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ The dotnet-trace tool is a cross-platform CLI global tool that enables the colle
77
The first step is to install the dotnet-trace CLI global tool.
88

99
```cmd
10-
$ dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1
10+
$ dotnet tool install --global dotnet-trace
1111
You can invoke the tool using the following command: dotnet-trace
12-
Tool 'dotnet-trace' (version '3.0.0-preview9.19454.1') was successfully installed.
12+
Tool 'dotnet-trace' (version '3.0.0.47001') was successfully installed.
1313
```
1414

1515
## Using dotnet-trace

documentation/installing-sos-instructions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Installing SOS on Linux and MacOS
33

44
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).
55

6-
$ dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1
6+
$ dotnet tool install -g dotnet-sos
77
You can invoke the tool using the following command: dotnet-sos
8-
Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed.
8+
Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed.
99

1010
The next step is use this global tool to install SOS.
1111

1212
$ dotnet-sos install
13-
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
13+
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
1414
Creating installation directory...
1515
Copying files...
1616
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
7272
The installer needs to be run again:
7373

7474
$ dotnet-sos install
75-
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
75+
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
7676
Installing over existing installation...
7777
Creating installation directory...
7878
Copying files...
@@ -92,4 +92,4 @@ To uninstall and remove the lldb configuration run this command:
9292
To remove the SOS installer global tool:
9393

9494
$ dotnet tool uninstall -g dotnet-sos
95-
Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully uninstalled.
95+
Tool 'dotnet-sos' (version '3.0.0.47001') was successfully uninstalled.

documentation/installing-sos-windows-instructions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ SOS will automatically be loaded from the internal Microsoft extension gallery.
4747

4848
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.
4949

50-
C:\Users\mikem>dotnet tool install -g dotnet-sos --version 3.0.0-preview9.19454.1
50+
C:\Users\mikem>dotnet tool install -g dotnet-sos
5151
You can invoke the tool using the following command: dotnet-sos
52-
Tool 'dotnet-sos' (version '3.0.0-preview9.19454.1') was successfully installed.
52+
Tool 'dotnet-sos' (version '3.0.0.47001') was successfully installed.
5353

5454
Run the installer:
5555

5656
C:\Users\mikem>dotnet-sos install
57-
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
57+
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
5858
Creating installation directory...
5959
Copying files...
6060
Execute '.load C:\Users\mikem\.dotnet\sos\sos.dll' to load SOS in your Windows debugger.

documentation/tutorial/installing_the_diagnostics_tools.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ Depending on the diagnostics scenario you will use one or more of the tools belo
66
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:
77

88
> ```bash
9-
> dotnet tool install --global dotnet-counters --version 3.0.0-preview9.19454.1
9+
> dotnet tool install --global dotnet-counters
1010
> ```
1111
1212
1313
### dotnet-trace
1414
.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:
1515
1616
> ```bash
17-
> dotnet tool install --global dotnet-trace --version 3.0.0-preview9.19454.1
17+
> dotnet tool install --global dotnet-trace
1818
> ```
1919
2020
2121
### dotnet-dump
2222
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:
2323
2424
> ```bash
25-
> dotnet tool install --global dotnet-dump --version 3.0.0-preview9.19454.1
25+
> dotnet tool install --global dotnet-dump
2626
> ```
2727
2828

eng/Build-Native.cmd

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,14 @@ if /i %__BuildCrossArch% EQU 1 (
196196
if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%"
197197

198198
echo Generating Version Header
199+
set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog"
200+
"%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
201+
if not !errorlevel! == 0 (
202+
echo Generate Version Restore FAILED
203+
exit /b 1
204+
)
199205
set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
200-
"%__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%
206+
"%__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%
201207
if not !errorlevel! == 0 (
202208
echo Generate Version Header FAILED
203209
exit /b 1
@@ -274,8 +280,14 @@ if %__Build% EQU 1 (
274280
)
275281

276282
echo Generating Version Header
283+
set __GenerateVersionRestoreLog="%__LogDir%\GenerateVersionRestore.binlog"
284+
"%__DotNetCli%" msbuild "%__ProjectDir%\eng\CreateVersionFile.csproj" /v:!__Verbosity! /bl:!__GenerateVersionRestoreLog! /t:Restore /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__UnprocessedBuildArgs%
285+
if not !errorlevel! == 0 (
286+
echo Generate Version Restore FAILED
287+
exit /b 1
288+
)
277289
set __GenerateVersionLog="%__LogDir%\GenerateVersion.binlog"
278-
"%__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%
290+
"%__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%
279291
if not !errorlevel! == 0 (
280292
echo Generate Version Header FAILED
281293
exit /b 1
File renamed without changes.

0 commit comments

Comments
 (0)