Update to newer NuGet.VisualStudio version

zivkan · zivkan · commit 2fa4d9213798 · 2024-05-30T12:36:52.000+09:30
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -98,7 +98,7 @@
     <PackageVersion Include="Roslyn.Diagnostics.Analyzers"                                           Version="3.11.0-beta1.23472.1" />
 
     <!-- NuGet -->
-    <PackageVersion Include="NuGet.VisualStudio"                                                     Version="17.11.0-preview.2.61" />
+    <PackageVersion Include="NuGet.VisualStudio"                                                     Version="17.11.0-preview.2.71" />
 
     <!-- Framework packages -->
     <PackageVersion Include="Microsoft.IO.Redist"                                                    Version="6.0.0" />
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/VsReferenceItem.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/VsReferenceItem.cs
@@ -15,5 +15,5 @@ internal class VsReferenceItem(ReferenceItem referenceItem) : IVsReferenceItem2
 {
     public string Name => referenceItem.Name;
 
-    public IReadOnlyDictionary<string, string?>? Metadata => referenceItem.Properties!;
+    public IReadOnlyDictionary<string, string>? Metadata => referenceItem.Properties;
 }
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/VsTargetFrameworkInfo.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/VsTargetFrameworkInfo.cs
@@ -13,12 +13,12 @@ namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore;
 [DebuggerDisplay("TargetFrameworkMoniker = {TargetFrameworkMoniker}")]
 internal class VsTargetFrameworkInfo(TargetFrameworkInfo targetFrameworkInfo) : IVsTargetFrameworkInfo4
 {
-    private IReadOnlyDictionary<string, string?>? _properties;
+    private IReadOnlyDictionary<string, string>? _properties;
     private IReadOnlyDictionary<string, IReadOnlyList<IVsReferenceItem2>>? _items;
 
     public string TargetFrameworkMoniker => targetFrameworkInfo.TargetFrameworkMoniker;
 
-    public IReadOnlyDictionary<string, string?> Properties => _properties ??= targetFrameworkInfo.Properties;
+    public IReadOnlyDictionary<string, string> Properties => _properties ??= targetFrameworkInfo.Properties;
 
     public IReadOnlyDictionary<string, IReadOnlyList<IVsReferenceItem2>> Items
     {
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/RuleExporter.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Rules/RuleExporter.cs
@@ -164,7 +164,7 @@ private static class PackageRestoreRules
             [ExportRule(nameof(CollectedNuGetAuditSuppressions), PropertyPageContexts.ProjectSubscriptionService)]
             [AppliesTo(ProjectCapability.PackageReferences)]
             [Order(Order.Default)]
-            public static int CollectedNuGetAuditSuppressions;
+            public static int CollectedNuGetAuditSuppressionsRule;
 
             /// <summary>
             ///     Represents the evaluation properties that are passed that are passed to restore.

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ internal class VsReferenceItem(ReferenceItem referenceItem) : IVsReferenceItem2`
`15`	`15`	`{`
`16`	`16`	`public string Name => referenceItem.Name;`
`17`	`17`
`18`		`- public IReadOnlyDictionary<string, string?>? Metadata => referenceItem.Properties!;`
	`18`	`+ public IReadOnlyDictionary<string, string>? Metadata => referenceItem.Properties;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore;`
`13`	`13`	`[DebuggerDisplay("TargetFrameworkMoniker = {TargetFrameworkMoniker}")]`
`14`	`14`	`internal class VsTargetFrameworkInfo(TargetFrameworkInfo targetFrameworkInfo) : IVsTargetFrameworkInfo4`
`15`	`15`	`{`
`16`		`- private IReadOnlyDictionary<string, string?>? _properties;`
	`16`	`+ private IReadOnlyDictionary<string, string>? _properties;`
`17`	`17`	`private IReadOnlyDictionary<string, IReadOnlyList<IVsReferenceItem2>>? _items;`
`18`	`18`
`19`	`19`	`public string TargetFrameworkMoniker => targetFrameworkInfo.TargetFrameworkMoniker;`
`20`	`20`
`21`		`- public IReadOnlyDictionary<string, string?> Properties => _properties ??= targetFrameworkInfo.Properties;`
	`21`	`+ public IReadOnlyDictionary<string, string> Properties => _properties ??= targetFrameworkInfo.Properties;`
`22`	`22`
`23`	`23`	`public IReadOnlyDictionary<string, IReadOnlyList<IVsReferenceItem2>> Items`
`24`	`24`	`{`