Skip to content

Commit 387a241

Browse files
committed
C#: Set output verbosity to normal for both solution and project restore (needed to identify where assets file are located).
1 parent 506b911 commit 387a241

File tree

2 files changed

+3
-4
lines changed
  • csharp/extractor

2 files changed

+3
-4
lines changed

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void Info()
4242

4343
private string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching)
4444
{
45-
var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
45+
var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";
4646

4747
if (forceDotnetRefAssemblyFetching)
4848
{
@@ -74,7 +74,6 @@ public bool RestoreProjectToDirectory(string projectFile, string packageDirector
7474
public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, bool forceDotnetRefAssemblyFetching, out IEnumerable<string> projects)
7575
{
7676
var args = GetRestoreArgs(solutionFile, packageDirectory, forceDotnetRefAssemblyFetching);
77-
args += " --verbosity normal";
7877
if (dotnetCliInvoker.RunCommand(args, out var output))
7978
{
8079
var regex = RestoreProjectRegex();

csharp/extractor/Semmle.Extraction.Tests/DotNet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void TestDotnetRestoreProjectToDirectory1()
103103

104104
// Verify
105105
var lastArgs = dotnetCliInvoker.GetLastArgs();
106-
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true", lastArgs);
106+
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
107107
}
108108

109109
[Fact]
@@ -118,7 +118,7 @@ public void TestDotnetRestoreProjectToDirectory2()
118118

119119
// Verify
120120
var lastArgs = dotnetCliInvoker.GetLastArgs();
121-
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --configfile \"myconfig.config\"", lastArgs);
121+
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\"", lastArgs);
122122
}
123123

124124
[Fact]

0 commit comments

Comments
 (0)