Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/nbgv/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,9 @@ private static async Task<int> OnInstallCommand(string path, string version, str
context.Stage(directoryPackagesPropsPath);
}

ProjectItemElement item = propsFile.Items.FirstOrDefault(i => i.ItemType == PackageReferenceItemType && i.Include == PackageId);
ProjectItemElement item = propsFile.Items.FirstOrDefault(i =>
string.Equals(i.ItemType, PackageReferenceItemType, StringComparison.OrdinalIgnoreCase) &&
string.Equals(i.Include, PackageId, StringComparison.OrdinalIgnoreCase));

if (item is null)
{
Expand All @@ -418,7 +420,8 @@ private static async Task<int> OnInstallCommand(string path, string version, str
if (isCpmEnabled)
{
// Remove Version metadata if CPM is enabled
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
if (versionMetadata is not null)
{
item.RemoveChild(versionMetadata);
Expand All @@ -427,7 +430,8 @@ private static async Task<int> OnInstallCommand(string path, string version, str
else
{
// Update Version metadata if CPM is not enabled
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
if (versionMetadata is not null)
{
versionMetadata.Value = packageVersion;
Expand Down Expand Up @@ -926,7 +930,8 @@ private static void UpdateDirectoryPackagesProps(string path, string packageId,
const string VersionMetadataName = "Version";

ProjectItemElement item = propsFile.Items.FirstOrDefault(i =>
i.ItemType == PackageVersionItemType && i.Include == packageId);
string.Equals(i.ItemType, PackageVersionItemType, StringComparison.OrdinalIgnoreCase) &&
string.Equals(i.Include, packageId, StringComparison.OrdinalIgnoreCase));

if (item is null)
{
Expand All @@ -940,7 +945,8 @@ private static void UpdateDirectoryPackagesProps(string path, string packageId,
}
else
{
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
if (versionMetadata is not null)
{
versionMetadata.Value = packageVersion;
Expand Down
Loading