Skip to content

Commit 21a3956

Browse files
authored
Merge pull request #1213 from dotnet/msbuildCaseInsensitive
msbuildCaseInsensitive
2 parents 8e03b52 + 718354b commit 21a3956

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/nbgv/Program.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,9 @@ private static async Task<int> OnInstallCommand(string path, string version, str
393393
context.Stage(directoryPackagesPropsPath);
394394
}
395395

396-
ProjectItemElement item = propsFile.Items.FirstOrDefault(i => i.ItemType == PackageReferenceItemType && i.Include == PackageId);
396+
ProjectItemElement item = propsFile.Items.FirstOrDefault(i =>
397+
string.Equals(i.ItemType, PackageReferenceItemType, StringComparison.OrdinalIgnoreCase) &&
398+
string.Equals(i.Include, PackageId, StringComparison.OrdinalIgnoreCase));
397399

398400
if (item is null)
399401
{
@@ -418,7 +420,8 @@ private static async Task<int> OnInstallCommand(string path, string version, str
418420
if (isCpmEnabled)
419421
{
420422
// Remove Version metadata if CPM is enabled
421-
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
423+
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
424+
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
422425
if (versionMetadata is not null)
423426
{
424427
item.RemoveChild(versionMetadata);
@@ -427,7 +430,8 @@ private static async Task<int> OnInstallCommand(string path, string version, str
427430
else
428431
{
429432
// Update Version metadata if CPM is not enabled
430-
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
433+
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
434+
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
431435
if (versionMetadata is not null)
432436
{
433437
versionMetadata.Value = packageVersion;
@@ -926,7 +930,8 @@ private static void UpdateDirectoryPackagesProps(string path, string packageId,
926930
const string VersionMetadataName = "Version";
927931

928932
ProjectItemElement item = propsFile.Items.FirstOrDefault(i =>
929-
i.ItemType == PackageVersionItemType && i.Include == packageId);
933+
string.Equals(i.ItemType, PackageVersionItemType, StringComparison.OrdinalIgnoreCase) &&
934+
string.Equals(i.Include, packageId, StringComparison.OrdinalIgnoreCase));
930935

931936
if (item is null)
932937
{
@@ -940,7 +945,8 @@ private static void UpdateDirectoryPackagesProps(string path, string packageId,
940945
}
941946
else
942947
{
943-
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m => m.Name == VersionMetadataName);
948+
ProjectMetadataElement versionMetadata = item.Metadata.FirstOrDefault(m =>
949+
string.Equals(m.Name, VersionMetadataName, StringComparison.OrdinalIgnoreCase));
944950
if (versionMetadata is not null)
945951
{
946952
versionMetadata.Value = packageVersion;

0 commit comments

Comments
 (0)