more traces

Author: baronfel

src/Cli/dotnet/CommandFactory/CommandResolution/ActivityContext.cs

@@ -17,7 +17,7 @@ public static class ActivityContext
             return null;
         }
         var contextToInject = currentActivity.Context;
-        if (contextToInject.TraceId == default || contextToInject.SpanId == default || contextToInject.TraceState is null)
+        if (contextToInject.TraceId == default && contextToInject.SpanId == default && contextToInject.TraceState is null)
         {
             return null;
         }

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -41,7 +41,7 @@ internal class ToolExecuteCommand(ParseResult result, ToolManifestFinder? toolMa
 
     public override int Execute()
     {
-        VersionRange versionRange = _parseResult.GetVersionRange();
+        VersionRange? versionRange = _parseResult.GetVersionRange();
         PackageId packageId = new PackageId(_packageToolIdentityArgument.Id);
 
         var toolLocationActivity = Activities.Source.StartActivity("find-tool");

src/Cli/dotnet/Commands/Tool/Install/ParseResultExtension.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using NuGet.Versioning;
@@ -11,7 +9,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal static class ParseResultExtension
 {
-    public static VersionRange GetVersionRange(this ParseResult parseResult)
+    public static VersionRange? GetVersionRange(this ParseResult parseResult)
     {
         var packageVersionFromIdentityArgument = parseResult.GetValue(ToolInstallCommandParser.PackageIdentityArgument).VersionRange?.OriginalString;
         var packageVersionFromVersionOption = parseResult.GetValue(ToolInstallCommandParser.VersionOption);
@@ -22,7 +20,7 @@ public static VersionRange GetVersionRange(this ParseResult parseResult)
             throw new GracefulException(CliStrings.PackageIdentityArgumentVersionOptionConflict);
         }
 
-        string packageVersion = packageVersionFromIdentityArgument ?? packageVersionFromVersionOption;
+        string? packageVersion = packageVersionFromIdentityArgument ?? packageVersionFromVersionOption;
 
         bool prerelease = parseResult.GetValue(ToolInstallCommandParser.PrereleaseOption);
 
@@ -39,10 +37,10 @@ public static VersionRange GetVersionRange(this ParseResult parseResult)
             packageVersion = "*-*";
         }
 
-        VersionRange versionRange = null;
+        VersionRange? versionRange = null;
 
         // accept 'bare' versions and interpret 'bare' versions as NuGet exact versions
-        if (!string.IsNullOrEmpty(packageVersion) && NuGetVersion.TryParse(packageVersion, out NuGetVersion version2))
+        if (!string.IsNullOrEmpty(packageVersion) && NuGetVersion.TryParse(packageVersion, out NuGetVersion? version2))
         {
             return new VersionRange(minVersion: version2, includeMinVersion: true, maxVersion: version2, includeMaxVersion: true, originalString: "[" + packageVersion + "]");
         }

src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs

@@ -92,7 +92,7 @@ public ToolInstallGlobalOrToolPathCommand(
             NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption) || parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoHttpCacheOption),
             IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption),
             Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption));
-        nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: _restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true);
+        nugetPackageDownloader ??= new NuGetPackageDownloader.NuGetPackageDownloader(tempDir, verboseLogger: new NullLogger(), restoreActionConfig: _restoreActionConfig, verbosityOptions: _verbosity, verifySignatures: verifySignatures ?? true, shouldUsePackageSourceMapping: true);
         _shellShimTemplateFinder = new ShellShimTemplateFinder(nugetPackageDownloader, tempDir, packageSourceLocation);
         _store = store;
 
@@ -155,7 +155,7 @@ private int ExecuteInstallCommand(PackageId packageId)
             toolPath = new DirectoryPath(_toolPath);
         }
 
-        VersionRange versionRange = _parseResult.GetVersionRange();
+        VersionRange? versionRange = _parseResult.GetVersionRange();
 
         (IToolPackageStore toolPackageStore,
          IToolPackageStoreQuery toolPackageStoreQuery,
@@ -241,7 +241,7 @@ private int ExecuteInstallCommand(PackageId packageId)
         return 0;
     }
 
-    private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange versionRange, IToolPackageDownloader toolPackageDownloader)
+    private NuGetVersion GetBestMatchNugetVersion(PackageId packageId, VersionRange? versionRange, IToolPackageDownloader toolPackageDownloader)
     {
         return toolPackageDownloader.GetNuGetVersion(
             packageLocation: new PackageLocation(nugetConfig: GetConfigFile(), sourceFeedOverrides: _source, additionalFeeds: _addSource),