Merge branch 'main' into u/xiaoyun/updateMessagePackVersion

dotnet · Oct 29, 2024 · d841380 · d841380
2 parents b255aa8 + 78dcae0
commit d841380
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -68,7 +68,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Validation"                                      Version="17.8.8" />
     <PackageVersion Include="Microsoft.VisualStudio.XmlEditor"                                       Version="17.13.0-preview-1-35408-014" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools"                                             Version="17.13.17-preview1-ga15b669c04" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow"                                        Version="9.0.0-rc.2.24473.5" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow"                                        Version="8.0.0" />
     <PackageVersion Include="System.Formats.Asn1"                                                    Version="8.0.1" />
     <PackageVersion Include="Microsoft.VSDesigner"                                                   Version="17.13.38055-preview.1" />
     <PackageVersion Include="VsWebSite.Interop"                                                      Version="17.13.38055-preview.1" />

diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/StringComparers.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/StringComparers.cs
@@ -24,11 +24,9 @@ internal static class StringComparers
         public static StringComparer ItemTypes => StringComparer.OrdinalIgnoreCase;
         public static StringComparer TargetNames => StringComparer.OrdinalIgnoreCase;
         public static StringComparer FrameworkIdentifiers => StringComparer.OrdinalIgnoreCase;
-        public static StringComparer LibraryNames => StringComparer.Ordinal;
         public static StringComparer EnvironmentVariableNames => StringComparer.OrdinalIgnoreCase;
         public static StringComparer TelemetryEventNames => StringComparer.Ordinal;
         public static StringComparer NamedExports => StringComparer.OrdinalIgnoreCase;
-        public static StringComparer UIPropertyNames => StringComparer.OrdinalIgnoreCase;
         public static StringComparer LaunchSettingsPropertyNames => StringComparer.Ordinal;
         public static StringComparer LaunchProfileNames => StringComparer.Ordinal;
         public static StringComparer LaunchProfileProperties => StringComparer.Ordinal;
@@ -38,7 +36,6 @@ internal static class StringComparers
         public static StringComparer LanguageIdentifiers => StringComparer.Ordinal;
         public static StringComparer LanguageIdentifiersIgnoreCase => StringComparer.OrdinalIgnoreCase;
         public static StringComparer VisualStudioSetupComponentIds => StringComparer.OrdinalIgnoreCase;
-        public static StringComparer WorkloadNames => StringComparer.OrdinalIgnoreCase;
     }
 
     /// <summary>
@@ -63,11 +60,9 @@ internal static class StringComparisons
         public static StringComparison ItemTypes => StringComparison.OrdinalIgnoreCase;
         public static StringComparison TargetNames => StringComparison.OrdinalIgnoreCase;
         public static StringComparison FrameworkIdentifiers => StringComparison.OrdinalIgnoreCase;
-        public static StringComparison LibraryNames => StringComparison.Ordinal;
         public static StringComparison EnvironmentVariableNames => StringComparison.OrdinalIgnoreCase;
         public static StringComparison TelemetryEventNames => StringComparison.Ordinal;
         public static StringComparison NamedExports => StringComparison.OrdinalIgnoreCase;
-        public static StringComparison UIPropertyNames => StringComparison.OrdinalIgnoreCase;
         public static StringComparison LaunchSettingsPropertyNames => StringComparison.Ordinal;
         public static StringComparison LaunchProfileNames => StringComparison.Ordinal;
         public static StringComparison LaunchProfileProperties => StringComparison.Ordinal;
@@ -77,6 +72,5 @@ internal static class StringComparisons
         public static StringComparison LanguageIdentifiers => StringComparison.Ordinal;
         public static StringComparison LanguageIdentifiersIgnoreCase => StringComparison.OrdinalIgnoreCase;
         public static StringComparison VisualStudioSetupComponentIds => StringComparison.OrdinalIgnoreCase;
-        public static StringComparison WorkloadNames => StringComparison.OrdinalIgnoreCase;
     }
 }