Merge dev15.9.x to dev16.0.x (#4770)

Merge dev15.9.x to dev16.0.x
dotnet · Apr 30, 2019 · 144f544 · 144f544
2 parents 63e6b41 + 8061e7b
commit 144f544
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -54,6 +54,8 @@
 
     <!-- Prevent vsix manifests from being copied to the shared output directory, makes build more deterministic -->
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
+
+    <NoWarn>$(NoWarn);NU5125</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Microsoft.VisualStudio.Editors/PropPages/WPF/ApplicationPropPageVBWPF.vb b/src/Microsoft.VisualStudio.Editors/PropPages/WPF/ApplicationPropPageVBWPF.vb
@@ -935,7 +935,7 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages.WPF
             End Function
 
             Public Overrides Function GetHashCode() As Integer
-                Throw New NotImplementedException()
+                Return -1937169414 + StringComparer.OrdinalIgnoreCase.GetHashCode(Value)
             End Function
 
         End Class
@@ -969,7 +969,10 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages.WPF
             End Function
 
             Public Overrides Function GetHashCode() As Integer
-                Throw New NotImplementedException()
+                Dim hashCode = 870297925
+                hashCode = hashCode * -1521134295 + MyBase.GetHashCode()
+                hashCode = hashCode * -1521134295 + IsEquivalentToSubMain.GetHashCode()
+                Return hashCode
             End Function
 
         End Class