Skip to content

Commit 34c4bde

Browse files
authored
Update the logic of dependency check (#20040)
1 parent d8e8689 commit 34c4bde

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

build.proj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@
279279
<Target Name="StaticAnalysis" DependsOnTargets="StaticAnalysisBreakingChange;StaticAnalysisDependency;StaticAnalysisSignature;StaticAnalysisHelp;StaticAnalysisExample;StaticAnalysisFileChange">
280280
<Message Importance="high" Text="Running static analysis..." />
281281

282-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
283-
284282
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1 -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory) &quot;"/>
285283
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers check-error" />
286284
<OnError ExecuteTargets="StaticAnalysisErrorMessage" />

tools/ExecuteCIStep.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ If ($StaticAnalysisBreakingChange)
220220
}
221221
Return
222222
}
223-
224223
If ($StaticAnalysisDependency)
225224
{
226225
If ($PSBoundParameters.ContainsKey("TargetModule"))
@@ -234,6 +233,7 @@ If ($StaticAnalysisDependency)
234233
If ("" -Ne $DependencyCheckModuleList)
235234
{
236235
dotnet $RepoArtifacts/StaticAnalysis/StaticAnalysis.Netcore.dll -p $RepoArtifacts/$Configuration -r $StaticAnalysisOutputDirectory --analyzers dependency -u -m $DependencyCheckModuleList
236+
.($PSScriptRoot + "/CheckAssemblies.ps1") -BuildConfig $Configuration
237237
}
238238
Return
239239
}

tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ private static bool IsFrameworkAssembly(string name)
420420

421421
private void ProcessDirectory(string directoryPath)
422422
{
423+
directoryPath = System.IO.Path.GetFullPath(directoryPath);
423424
var savedDirectory = Directory.GetCurrentDirectory();
424425
Directory.SetCurrentDirectory(directoryPath);
425426
var moduleAlcAssemblySet = LoadModuleAclAssembly(directoryPath);

0 commit comments

Comments
 (0)