Skip to content

Commit

Permalink
use break and continue to reduce nesting
Browse files Browse the repository at this point in the history
  • Loading branch information
@brettfo @randhircs
brettfo authored and randhircs committed Jan 9, 2025
1 parent 233dfc3 commit 00d66f6
Showing 1 changed file with 53 additions and 39 deletions.
92 changes: 53 additions & 39 deletions nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,48 +213,62 @@ public static async Task<ImmutableArray<ProjectDiscoveryResult>> DiscoverWithBin
if (experimentsManager.InstallDotnetSdks)
{
var projectEvaluation = GetNearestProjectEvaluation(target);
if (projectEvaluation is not null)
if (projectEvaluation is null)
{
break;
}

var removedReferences = target.Children.OfType<RemoveItem>().FirstOrDefault(r => r.Name == "Reference");
var addedReferences = target.Children.OfType<AddItem>().FirstOrDefault(r => r.Name == "Reference");
if (removedReferences is null || addedReferences is null)
{
break;
}

foreach (var removedAssembly in removedReferences.Children.OfType<Item>())
{
var removedReferences = target.Children.OfType<RemoveItem>().FirstOrDefault(r => r.Name == "Reference");
var addedReferences = target.Children.OfType<AddItem>().FirstOrDefault(r => r.Name == "Reference");
if (removedReferences is not null && addedReferences is not null)
var removedPackageName = GetChildMetadataValue(removedAssembly, "NuGetPackageId");
var removedFileName = Path.GetFileName(removedAssembly.Name);
if (removedPackageName is null || removedFileName is null)
{
foreach (var removedAssembly in removedReferences.Children.OfType<Item>())
{
var removedPackageName = GetChildMetadataValue(removedAssembly, "NuGetPackageId");
var removedFileName = Path.GetFileName(removedAssembly.Name);
if (removedPackageName is not null && removedFileName is not null)
{
var existingProjectPackagesByTfm = packagesPerProject.GetOrAdd(projectEvaluation.ProjectFile, () => new(PathComparer.Instance));
var existingProjectPackages = existingProjectPackagesByTfm.GetOrAdd(tfm, () => new(StringComparer.OrdinalIgnoreCase));
if (existingProjectPackages.ContainsKey(removedPackageName))
{
var correspondingAddedFile = addedReferences.Children.OfType<Item>()
.FirstOrDefault(i => removedFileName.Equals(Path.GetFileName(i.Name), StringComparison.OrdinalIgnoreCase));
if (correspondingAddedFile is not null)
{
var runtimePackageName = GetChildMetadataValue(correspondingAddedFile, "NuGetPackageId");
var runtimePackageVersion = GetChildMetadataValue(correspondingAddedFile, "NuGetPackageVersion");
if (runtimePackageName is not null &&
runtimePackageVersion is not null &&
SemVersion.TryParse(runtimePackageVersion, out var parsedRuntimePackageVersion))
{
var packageMapper = DotNetPackageCorrelationManager.GetPackageMapper();
var replacementPackageVersion = packageMapper.GetPackageVersionThatShippedWithOtherPackage(runtimePackageName, parsedRuntimePackageVersion, removedPackageName);
if (replacementPackageVersion is not null)
{
var packagesPerThisProject = packagesReplacedBySdkPerProject.GetOrAdd(projectEvaluation.ProjectFile, () => new(PathComparer.Instance));
var packagesPerTfm = packagesPerThisProject.GetOrAdd(tfm, () => new(StringComparer.OrdinalIgnoreCase));
packagesPerTfm[removedPackageName] = replacementPackageVersion.ToString();
var relativeProjectPath = Path.GetRelativePath(repoRootPath, projectEvaluation.ProjectFile).NormalizePathToUnix();
logger.Info($"Re-added SDK managed package [{removedPackageName}/{replacementPackageVersion}] to project [{relativeProjectPath}]");
}
}
}
}
}
}
continue;
}

var existingProjectPackagesByTfm = packagesPerProject.GetOrAdd(projectEvaluation.ProjectFile, () => new(PathComparer.Instance));
var existingProjectPackages = existingProjectPackagesByTfm.GetOrAdd(tfm, () => new(StringComparer.OrdinalIgnoreCase));
if (!existingProjectPackages.ContainsKey(removedPackageName))
{
continue;
}

var correspondingAddedFile = addedReferences.Children.OfType<Item>()
.FirstOrDefault(i => removedFileName.Equals(Path.GetFileName(i.Name), StringComparison.OrdinalIgnoreCase));
if (correspondingAddedFile is null)
{
continue;
}

var runtimePackageName = GetChildMetadataValue(correspondingAddedFile, "NuGetPackageId");
var runtimePackageVersion = GetChildMetadataValue(correspondingAddedFile, "NuGetPackageVersion");
if (runtimePackageName is null ||
runtimePackageVersion is null ||
!SemVersion.TryParse(runtimePackageVersion, out var parsedRuntimePackageVersion))
{
continue;
}

var packageMapper = DotNetPackageCorrelationManager.GetPackageMapper();
var replacementPackageVersion = packageMapper.GetPackageVersionThatShippedWithOtherPackage(runtimePackageName, parsedRuntimePackageVersion, removedPackageName);
if (replacementPackageVersion is null)
{
continue;
}

var packagesPerThisProject = packagesReplacedBySdkPerProject.GetOrAdd(projectEvaluation.ProjectFile, () => new(PathComparer.Instance));
var packagesPerTfm = packagesPerThisProject.GetOrAdd(tfm, () => new(StringComparer.OrdinalIgnoreCase));
packagesPerTfm[removedPackageName] = replacementPackageVersion.ToString();
var relativeProjectPath = Path.GetRelativePath(repoRootPath, projectEvaluation.ProjectFile).NormalizePathToUnix();
logger.Info($"Re-added SDK managed package [{removedPackageName}/{replacementPackageVersion}] to project [{relativeProjectPath}]");
}
}
break;
Expand Down

0 comments on commit 00d66f6

Please sign in to comment.