Skip to content

[Issue #34508] WIP: Implement --no-cache option for tool install locally #36369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release/8.0.4xx
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Threading.Tasks;
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
using Microsoft.DotNet.ToolPackage;
using NuGet.Versioning;

Expand All @@ -14,6 +15,7 @@
VersionRange versionRange = null,
string targetFramework = null,
bool isGlobalTool = false,
RestoreActionConfig restoreActionConfig = null

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin_AoT_Tests Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_22_04 Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_22_04 Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin_TemplateEngine Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_20_04_TemplateEngine Build_Release)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 18 in src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs#L18

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs(18,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected
bool isGlobalToolRollForward = false
);
}
Expand Down
16 changes: 9 additions & 7 deletions src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
_globalToolStageDir = _toolPackageStore.GetRandomStagingDirectory();
ISettings settings = Settings.LoadDefaultSettings(Directory.GetCurrentDirectory());
_localToolDownloadDir = new DirectoryPath(SettingsUtility.GetGlobalPackagesFolder(settings));

_localToolAssetDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory());
_runtimeJsonPath = runtimeJsonPathForTests ?? Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "RuntimeIdentifierGraph.json");
}
Expand All @@ -77,6 +77,7 @@
VersionRange versionRange = null,
string targetFramework = null,
bool isGlobalTool = false,
RestoreActionConfig restoreActionConfig = null

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin_AoT_Tests Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_22_04 Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_22_04 Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin_TemplateEngine Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Darwin Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci (Build Ubuntu_20_04_TemplateEngine Build_Release)

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected

Check failure on line 80 in src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

View check run for this annotation

Azure Pipelines / dotnet-sdk-public-ci

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs#L80

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs(80,59): error CS1003: (NETCORE_ENGINEERING_TELEMETRY=Build) Syntax error, ',' expected
bool isGlobalToolRollForward = false
)
{
Expand All @@ -100,7 +101,8 @@

var toolDownloadDir = isGlobalTool ? _globalToolStageDir : _localToolDownloadDir;
var assetFileDirectory = isGlobalTool ? _globalToolStageDir : _localToolAssetDir;
var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(toolDownloadDir, verboseLogger: nugetLogger, isNuGetTool: true, verbosityOptions: verbosity);

var nugetPackageDownloader = new NuGetPackageDownloader.NuGetPackageDownloader(toolDownloadDir, verboseLogger: nugetLogger, isNuGetTool: true, verbosityOptions: verbosity, restoreActionConfig: restoreActionConfig);

var packageSourceLocation = new PackageSourceLocation(packageLocation.NugetConfig, packageLocation.RootConfigDirectory, null, packageLocation.AdditionalFeeds);

Expand All @@ -111,7 +113,7 @@
}
NuGetVersion packageVersion = nugetPackageDownloader.GetBestPackageVersionAsync(packageId, versionRange, packageSourceLocation).GetAwaiter().GetResult();

rollbackDirectory = isGlobalTool ? toolDownloadDir.Value: Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToString());
rollbackDirectory = isGlobalTool ? toolDownloadDir.Value : Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToString());

if (isGlobalTool)
{
Expand All @@ -134,15 +136,15 @@
{
DownloadAndExtractPackage(packageLocation, packageId, nugetPackageDownloader, toolDownloadDir.Value, _toolPackageStore, packageVersion, packageSourceLocation, includeUnlisted: givenSpecificVersion).GetAwaiter().GetResult();
}
else if(isGlobalTool)
else if (isGlobalTool)
{
throw new ToolPackageException(
string.Format(
CommonLocalizableStrings.ToolPackageConflictPackageId,
packageId,
packageVersion.ToNormalizedString()));
}

CreateAssetFile(packageId, packageVersion, toolDownloadDir, assetFileDirectory, _runtimeJsonPath, targetFramework);

DirectoryPath toolReturnPackageDirectory;
Expand Down Expand Up @@ -347,9 +349,9 @@
var managedCriteria = new List<SelectionCriteria>(1);
// Use major.minor version of currently running version of .NET
NuGetFramework currentTargetFramework;
if(targetFramework != null)
if (targetFramework != null)
{
currentTargetFramework = NuGetFramework.Parse(targetFramework);
currentTargetFramework = NuGetFramework.Parse(targetFramework);
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.CommandLine;
using System.IO;
using Microsoft.DotNet.Cli;
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
using Microsoft.DotNet.Cli.ToolPackage;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.ToolPackage;
Expand All @@ -24,6 +25,7 @@ internal class ToolInstallLocalInstaller
private readonly string _configFilePath;
private readonly string[] _sources;
private readonly VerbosityOptions _verbosity;
private readonly RestoreActionConfig _restoreActionConfig;

public ToolInstallLocalInstaller(
ParseResult parseResult,
Expand All @@ -43,8 +45,11 @@ public ToolInstallLocalInstaller(
additionalRestoreArguments: parseResult.OptionValuesToBeForwarded(ToolInstallCommandParser.GetCommand()));
_toolPackageStore = toolPackageStoresAndDownloader.store;
_toolPackageDownloader = toolPackageDownloader?? toolPackageStoresAndDownloader.downloader;


_restoreActionConfig = new RestoreActionConfig(DisableParallel: parseResult.GetValue(ToolCommandRestorePassThroughOptions.DisableParallelOption),
NoCache: parseResult.GetValue(ToolCommandRestorePassThroughOptions.NoCacheOption),
IgnoreFailedSources: parseResult.GetValue(ToolCommandRestorePassThroughOptions.IgnoreFailedSourcesOption),
Interactive: parseResult.GetValue(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption));

TargetFrameworkToInstall = BundledTargetFramework.GetTargetFrameworkMoniker();
}

Expand Down Expand Up @@ -76,7 +81,8 @@ public IToolPackage Install(FilePath manifestFile)
_packageId,
verbosity: _verbosity,
versionRange,
TargetFrameworkToInstall
TargetFrameworkToInstall,
restoreActionConfig: _restoreActionConfig
);

return toolDownloadedPackage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.DotNet.ToolPackage;
using Microsoft.Extensions.EnvironmentAbstractions;
using Microsoft.NET.TestFramework.Utilities;
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
using NuGet.Frameworks;
using NuGet.Versioning;
using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings;
Expand Down Expand Up @@ -97,6 +98,7 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa
VersionRange versionRange = null,
string targetFramework = null,
bool isGlobalTool = false,
RestoreActionConfig restoreActionConfig = null
bool isGlobalToolRollForward = false
)
{
Expand Down
Loading