Merge pull request github#13619 from tamasvajk/remove-rename-standalone

tamasvajk · web-flow · commit 4e4c5f858edf · 2023-06-30T12:24:05.000+02:00
C#: Remove the renaming of `Directory.Build.props` from standalone extraction
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs
@@ -100,9 +100,8 @@ public BuildAnalysis(Options options, IProgressMonitor progress)
                 dllDirNames.Add(runtimeLocation);
             }
 
-            // These files can sometimes prevent `dotnet restore` from working correctly.
+            // TODO: remove the below when the required SDK is installed
             using (new FileRenamer(sourceDir.GetFiles("global.json", SearchOption.AllDirectories)))
-            using (new FileRenamer(sourceDir.GetFiles("Directory.Build.props", SearchOption.AllDirectories)))
             {
                 var solutions = options.SolutionFile is not null ?
                         new[] { options.SolutionFile } :

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,8 @@ public BuildAnalysis(Options options, IProgressMonitor progress)`
`100`	`100`	`dllDirNames.Add(runtimeLocation);`
`101`	`101`	`}`
`102`	`102`
`103`		- // These files can sometimes prevent `dotnet restore` from working correctly.
	`103`	`+ // TODO: remove the below when the required SDK is installed`
`104`	`104`	`using (new FileRenamer(sourceDir.GetFiles("global.json", SearchOption.AllDirectories)))`
`105`		`- using (new FileRenamer(sourceDir.GetFiles("Directory.Build.props", SearchOption.AllDirectories)))`
`106`	`105`	`{`
`107`	`106`	`var solutions = options.SolutionFile is not null ?`
`108`	`107`	`new[] { options.SolutionFile } :`