Skip to content

Commit

Permalink
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20223)
Browse files Browse the repository at this point in the history
  • Loading branch information
MiYanni authored Nov 7, 2024
2 parents 8f861a5 + 649bc90 commit d3e2b6b
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ private static void RemoveExcludedAssemblyVersionPaths(Dictionary<string, Versio
{
string assemblyPath = sbSdkFileArray[i];
Version? sbVersion = sbSdkAssemblyVersions[assemblyPath];
Version? msftVersion = msftSdkAssemblyVersions[assemblyPath];
if (!msftSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? msftVersion))
{
sbSdkAssemblyVersions.Remove(assemblyPath);
continue;
}

if (sbVersion is not null &&
msftVersion is not null &&
Expand Down Expand Up @@ -163,7 +167,7 @@ private string FindMatchingFilePath(string rootDir, Matcher matcher, string repr
}
}

Assert.Fail($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
OutputHelper.WriteLine($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
return string.Empty;
}

Expand Down

0 comments on commit d3e2b6b

Please sign in to comment.