Skip to content

Commit adbaaf8

Browse files
committed
Rename "properties" to "metadata"
We refer to name/value pairs on items as "metadata" to differentiate them from project-level properties.
1 parent fd40c34 commit adbaaf8

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/VsReferenceItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ internal class VsReferenceItem(ReferenceItem referenceItem) : IVsReferenceItem2
1515
{
1616
public string Name => referenceItem.Name;
1717

18-
public IReadOnlyDictionary<string, string>? Metadata => referenceItem.Properties;
18+
public IReadOnlyDictionary<string, string>? Metadata => referenceItem.Metadata;
1919
}

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/PackageRestore/Snapshots/ReferenceItem.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ internal sealed class ReferenceItem
1212
{
1313
// If additional state is added to this class, please update RestoreHasher
1414

15-
public ReferenceItem(string name, IImmutableDictionary<string, string> properties)
15+
public ReferenceItem(string name, IImmutableDictionary<string, string> metadata)
1616
{
1717
Requires.NotNullOrEmpty(name);
1818

1919
Name = name;
20-
Properties = properties;
20+
Metadata = metadata;
2121
}
2222

2323
/// <summary>
@@ -28,5 +28,5 @@ public ReferenceItem(string name, IImmutableDictionary<string, string> propertie
2828
/// <summary>
2929
/// Gets the name/value pair metadata associated with the reference.
3030
/// </summary>
31-
public IImmutableDictionary<string, string> Properties { get; }
31+
public IImmutableDictionary<string, string> Metadata { get; }
3232
}

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/PackageRestore/Snapshots/RestoreComparer.ReferenceItemEqualityComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public override bool Equals(ReferenceItem? x, ReferenceItem? y)
1414
if (!StringComparers.ItemNames.Equals(x.Name, y.Name))
1515
return false;
1616

17-
if (!PropertiesAreEqual(x.Properties, y.Properties))
17+
if (!PropertiesAreEqual(x.Metadata, y.Metadata))
1818
return false;
1919

2020
return true;

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/PackageRestore/Snapshots/RestoreHasher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private static void AppendReferences(this IncrementalHasher hasher, ImmutableArr
5252

5353
private static void AppendReferenceProperties(this IncrementalHasher hasher, ReferenceItem reference)
5454
{
55-
foreach ((string key, string value) in reference.Properties)
55+
foreach ((string key, string value) in reference.Metadata)
5656
{
5757
hasher.AppendProperty(key, value);
5858
}

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/PackageRestore/Snapshots/RestoreLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static void LogReferenceItems(BatchLogger logger, string heading, Immuta
8686

8787
foreach (ReferenceItem reference in references)
8888
{
89-
IEnumerable<string> properties = reference.Properties.Select(prop => $"{prop.Key}:{prop.Value}");
89+
IEnumerable<string> properties = reference.Metadata.Select(prop => $"{prop.Key}:{prop.Value}");
9090

9191
logger.WriteLine($"{reference.Name} -- ({string.Join(" | ", properties)})");
9292
}

tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/PackageRestore/Snapshots/RestoreBuilderTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ public void ToProjectRestoreInfo_SetsToolReferences()
192192

193193
var toolReference1 = references.FirstOrDefault(r => r.Name == "ToolReference1");
194194
Assert.NotNull(toolReference1);
195-
AssertContainsProperty("Version", "1.0.0.0", toolReference1.Properties);
195+
AssertContainsProperty("Version", "1.0.0.0", toolReference1.Metadata);
196196

197197
var toolReference2 = references.FirstOrDefault(r => r.Name == "ToolReference2");
198198
Assert.NotNull(toolReference2);
199-
AssertContainsProperty("Version", "2.0.0.0", toolReference2.Properties);
199+
AssertContainsProperty("Version", "2.0.0.0", toolReference2.Metadata);
200200

201201
var toolReference3 = references.FirstOrDefault(r => r.Name == "ToolReference3");
202202
Assert.NotNull(toolReference3);
203-
AssertContainsProperty("Name", "Value", toolReference3.Properties);
203+
AssertContainsProperty("Name", "Value", toolReference3.Metadata);
204204
}
205205

206206
[Fact]
@@ -234,15 +234,15 @@ public void ToProjectRestoreInfo_SetsPackageReferences()
234234

235235
var packageReference1 = references.FirstOrDefault(r => r.Name == "PackageReference1");
236236
Assert.NotNull(packageReference1);
237-
AssertContainsProperty("Version", "1.0.0.0", packageReference1.Properties);
237+
AssertContainsProperty("Version", "1.0.0.0", packageReference1.Metadata);
238238

239239
var packageReference2 = references.FirstOrDefault(r => r.Name == "PackageReference2");
240240
Assert.NotNull(packageReference2);
241-
AssertContainsProperty("Version", "2.0.0.0", packageReference2.Properties);
241+
AssertContainsProperty("Version", "2.0.0.0", packageReference2.Metadata);
242242

243243
var packageReference3 = references.FirstOrDefault(r => r.Name == "PackageReference3");
244244
Assert.NotNull(packageReference3);
245-
AssertContainsProperty("Name", "Value", packageReference3.Properties);
245+
AssertContainsProperty("Name", "Value", packageReference3.Metadata);
246246
}
247247

248248
[Fact]
@@ -276,17 +276,17 @@ public void ToProjectRestoreInfo_SetsCentralPackageVersions()
276276

277277
var reference1 = versions.FirstOrDefault(r => r.Name == "Newtonsoft.Json");
278278
Assert.NotNull(reference1);
279-
AssertContainsProperty("Version", "1.0", reference1.Properties);
279+
AssertContainsProperty("Version", "1.0", reference1.Metadata);
280280

281281
var reference2 = versions.FirstOrDefault(r => r.Name == "System.IO");
282282
Assert.NotNull(reference2);
283-
AssertContainsProperty("Version", "2.0", reference2.Properties);
283+
AssertContainsProperty("Version", "2.0", reference2.Metadata);
284284

285285
var reference3 = versions.FirstOrDefault(r => r.Name == "Microsoft.Extensions");
286286
Assert.NotNull(reference3);
287287
Assert.Equal("Microsoft.Extensions", reference3.Name);
288288

289-
AssertContainsProperty("Version", "3.0", reference3.Properties);
289+
AssertContainsProperty("Version", "3.0", reference3.Metadata);
290290
}
291291

292292
[Fact]
@@ -344,17 +344,17 @@ public void ToProjectRestoreInfo_SetsPrunePackageReferences()
344344

345345
var reference1 = prunePackageReferences.FirstOrDefault(r => r.Name == "Newtonsoft.Json");
346346
Assert.NotNull(reference1);
347-
AssertContainsProperty("Version", "1.0", reference1.Properties);
347+
AssertContainsProperty("Version", "1.0", reference1.Metadata);
348348

349349
var reference2 = prunePackageReferences.FirstOrDefault(r => r.Name == "System.IO");
350350
Assert.NotNull(reference2);
351-
AssertContainsProperty("Version", "2.0", reference2.Properties);
351+
AssertContainsProperty("Version", "2.0", reference2.Metadata);
352352

353353
var reference3 = prunePackageReferences.FirstOrDefault(r => r.Name == "Microsoft.Extensions");
354354
Assert.NotNull(reference3);
355355
Assert.Equal("Microsoft.Extensions", reference3.Name);
356356

357-
AssertContainsProperty("Version", "3.0", reference3.Properties);
357+
AssertContainsProperty("Version", "3.0", reference3.Metadata);
358358
}
359359

360360
[Fact]
@@ -389,16 +389,16 @@ public void ToProjectRestoreInfo_SetsProjectReferences()
389389

390390
var reference1 = references.FirstOrDefault(p => p.Name == "..\\Project\\Project1.csproj");
391391
Assert.NotNull(reference1);
392-
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project1.csproj", reference1.Properties);
392+
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project1.csproj", reference1.Metadata);
393393

394394
var reference2 = references.FirstOrDefault(p => p.Name == "..\\Project\\Project2.csproj");
395395
Assert.NotNull(reference2);
396-
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project2.csproj", reference2.Properties);
396+
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project2.csproj", reference2.Metadata);
397397

398398
var reference3 = references.FirstOrDefault(p => p.Name == "..\\Project\\Project3.csproj");
399399
Assert.NotNull(reference3);
400-
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project3.csproj", reference3.Properties);
401-
AssertContainsProperty("MetadataName", "MetadataValue", reference3.Properties);
400+
AssertContainsProperty("ProjectFileFullPath", "C:\\Solution\\Project\\Project3.csproj", reference3.Metadata);
401+
AssertContainsProperty("MetadataName", "MetadataValue", reference3.Metadata);
402402
}
403403

404404
[Fact]
@@ -428,11 +428,11 @@ public void ToProjectRestoreInfo_SetsFrameworkReferences()
428428

429429
var reference1 = references.FirstOrDefault(r => r.Name == "WindowsForms");
430430
Assert.NotNull(reference1);
431-
Assert.Empty(reference1.Properties);
431+
Assert.Empty(reference1.Metadata);
432432

433433
var reference2 = references.FirstOrDefault(r => r.Name == "WPF");
434434
Assert.NotNull(reference2);
435-
AssertContainsProperty("PrivateAssets", "all", reference2.Properties);
435+
AssertContainsProperty("PrivateAssets", "all", reference2.Metadata);
436436
}
437437

438438
[Fact]
@@ -463,11 +463,11 @@ public void ToProjectRestoreInfo_SetsPackageDownloads()
463463

464464
var download1 = downloads.FirstOrDefault(d => d.Name == "NuGet.Common");
465465
Assert.NotNull(download1);
466-
AssertContainsProperty("Version", "[4.0.0];[5.0.0]", download1.Properties);
466+
AssertContainsProperty("Version", "[4.0.0];[5.0.0]", download1.Metadata);
467467

468468
var download2 = downloads.FirstOrDefault(d => d.Name == "NuGet.Frameworks");
469469
Assert.NotNull(download2);
470-
AssertContainsProperty("Version", "[4.9.4]", download2.Properties);
470+
AssertContainsProperty("Version", "[4.9.4]", download2.Metadata);
471471
}
472472

473473
private static void AssertContainsProperty(string name, string value, IImmutableDictionary<string, string> properties)

0 commit comments

Comments
 (0)