Skip to content

Commit 9a9f88a

Browse files
committed
Use /p:RestoreIgnoreFailedSources=true for dotnet restore
1 parent 600f585 commit 9a9f88a

File tree

2 files changed

+6
-5
lines changed
  • csharp/extractor

2 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ private void Info()
6666
private string GetRestoreArgs(RestoreSettings restoreSettings)
6767
{
6868
var args = $"restore --no-dependencies \"{restoreSettings.File}\" --packages \"{restoreSettings.PackageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal";
69+
args += " /p:RestoreIgnoreFailedSources=true";
6970

7071
if (restoreSettings.ForceDotnetRefAssemblyFetching)
7172
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void TestDotnetRestoreProjectToDirectory1()
119119

120120
// Verify
121121
var lastArgs = dotnetCliInvoker.GetLastArgs();
122-
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
122+
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal /p:RestoreIgnoreFailedSources=true", lastArgs);
123123
}
124124

125125
[Fact]
@@ -134,7 +134,7 @@ public void TestDotnetRestoreProjectToDirectory2()
134134

135135
// Verify
136136
var lastArgs = dotnetCliInvoker.GetLastArgs();
137-
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\"", lastArgs);
137+
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal /p:RestoreIgnoreFailedSources=true --configfile \"myconfig.config\"", lastArgs);
138138
Assert.Equal(2, res.AssetsFilePaths.Count());
139139
Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
140140
Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
@@ -152,7 +152,7 @@ public void TestDotnetRestoreProjectToDirectory3()
152152

153153
// Verify
154154
var lastArgs = dotnetCliInvoker.GetLastArgs();
155-
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile \"myconfig.config\" --force", lastArgs);
155+
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal /p:RestoreIgnoreFailedSources=true --configfile \"myconfig.config\" --force", lastArgs);
156156
Assert.Equal(2, res.AssetsFilePaths.Count());
157157
Assert.Contains("/path/to/project.assets.json", res.AssetsFilePaths);
158158
Assert.Contains("/path/to/project2.assets.json", res.AssetsFilePaths);
@@ -170,7 +170,7 @@ public void TestDotnetRestoreSolutionToDirectory1()
170170

171171
// Verify
172172
var lastArgs = dotnetCliInvoker.GetLastArgs();
173-
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
173+
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal /p:RestoreIgnoreFailedSources=true", lastArgs);
174174
Assert.Equal(2, res.RestoredProjects.Count());
175175
Assert.Contains("/path/to/project.csproj", res.RestoredProjects);
176176
Assert.Contains("/path/to/project2.csproj", res.RestoredProjects);
@@ -192,7 +192,7 @@ public void TestDotnetRestoreSolutionToDirectory2()
192192

193193
// Verify
194194
var lastArgs = dotnetCliInvoker.GetLastArgs();
195-
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
195+
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal /p:RestoreIgnoreFailedSources=true", lastArgs);
196196
Assert.Empty(res.RestoredProjects);
197197
Assert.Empty(res.AssetsFilePaths);
198198
}

0 commit comments

Comments
 (0)