diff --git a/build.proj b/build.proj index 0de7cdc611c0..df9fae332889 100644 --- a/build.proj +++ b/build.proj @@ -279,8 +279,6 @@ - - diff --git a/tools/ExecuteCIStep.ps1 b/tools/ExecuteCIStep.ps1 index cba543c6bfaa..46d803578a86 100644 --- a/tools/ExecuteCIStep.ps1 +++ b/tools/ExecuteCIStep.ps1 @@ -220,7 +220,6 @@ If ($StaticAnalysisBreakingChange) } Return } - If ($StaticAnalysisDependency) { If ($PSBoundParameters.ContainsKey("TargetModule")) @@ -234,6 +233,7 @@ If ($StaticAnalysisDependency) If ("" -Ne $DependencyCheckModuleList) { dotnet $RepoArtifacts/StaticAnalysis/StaticAnalysis.Netcore.dll -p $RepoArtifacts/$Configuration -r $StaticAnalysisOutputDirectory --analyzers dependency -u -m $DependencyCheckModuleList + .($PSScriptRoot + "/CheckAssemblies.ps1") -BuildConfig $Configuration } Return } diff --git a/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs b/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs index 9f746d503bbb..b6258cc1fcdb 100644 --- a/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs +++ b/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs @@ -420,6 +420,7 @@ private static bool IsFrameworkAssembly(string name) private void ProcessDirectory(string directoryPath) { + directoryPath = System.IO.Path.GetFullPath(directoryPath); var savedDirectory = Directory.GetCurrentDirectory(); Directory.SetCurrentDirectory(directoryPath); var moduleAlcAssemblySet = LoadModuleAclAssembly(directoryPath);