@@ -41,16 +41,23 @@ internal class ToolExecuteCommand(ParseResult result, ToolManifestFinder? toolMa
41
41
42
42
public override int Execute ( )
43
43
{
44
- VersionRange versionRange = _parseResult . GetVersionRange ( ) ;
44
+ VersionRange ? versionRange = _parseResult . GetVersionRange ( ) ;
45
45
PackageId packageId = new PackageId ( _packageToolIdentityArgument . Id ) ;
46
46
47
+ var toolLocationActivity = Activities . Source . StartActivity ( "find-tool" ) ;
48
+ toolLocationActivity ? . SetTag ( "packageId" , packageId . ToString ( ) ) ;
49
+ toolLocationActivity ? . SetTag ( "versionRange" , versionRange ? . ToString ( ) ?? "latest" ) ;
50
+
47
51
// Look in local tools manifest first, but only if version is not specified
48
52
if ( versionRange == null )
49
53
{
50
54
var localToolsResolverCache = new LocalToolsResolverCache ( ) ;
51
55
52
56
if ( _toolManifestFinder . TryFindPackageId ( packageId , out var toolManifestPackage ) )
53
57
{
58
+ toolLocationActivity ? . SetTag ( "kind" , "local" ) ;
59
+ toolLocationActivity ? . Stop ( ) ;
60
+
54
61
var toolPackageRestorer = new ToolPackageRestorer (
55
62
_toolPackageDownloader ,
56
63
_sources ,
@@ -82,6 +89,8 @@ public override int Execute()
82
89
additionalFeeds : _addSource ) ;
83
90
84
91
( var bestVersion , var packageSource ) = _toolPackageDownloader . GetNuGetVersion ( packageLocation , packageId , _verbosity , versionRange , _restoreActionConfig ) ;
92
+ toolLocationActivity ? . SetTag ( "kind" , "one-shot" ) ;
93
+ toolLocationActivity ? . Stop ( ) ;
85
94
86
95
// TargetFramework is null, which means to use the current framework. Global tools can override the target framework to use (or select assets for),
87
96
// but we don't support this for local or one-shot tools.
@@ -119,6 +128,10 @@ public override int Execute()
119
128
restoreActionConfig : _restoreActionConfig ) ;
120
129
}
121
130
131
+ using var toolExecuteActivity = Activities . Source . StartActivity ( "execute-tool" ) ;
132
+ toolExecuteActivity ? . SetTag ( "packageId" , packageId . ToString ( ) ) ;
133
+ toolExecuteActivity ? . SetTag ( "version" , toolPackage . Version . ToString ( ) ) ;
134
+ toolExecuteActivity ? . SetTag ( "source" , toolPackage . Command . Runner ) ;
122
135
var commandSpec = ToolCommandSpecCreator . CreateToolCommandSpec ( toolPackage . Command . Name . Value , toolPackage . Command . Executable . Value , toolPackage . Command . Runner , _allowRollForward , _forwardArguments ) ;
123
136
var command = CommandFactoryUsingResolver . Create ( commandSpec ) ;
124
137
var result = command . Execute ( ) ;
0 commit comments