ServerComon 2.36 to NuGetGalleryCore (#6643)

Take new version of ServerCommon to GalleryCore.
NuGet · Nov 9, 2018 · 5091aa4 · 5091aa4
1 parent 6cb7f30
commit 5091aa4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -242,10 +242,10 @@
       <Version>5.0.0-preview1.5665</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.31.0</Version>
+      <Version>2.36.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Issues">
-      <Version>2.31.0</Version>
+      <Version>2.36.0</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>7.1.2</Version>

diff --git a/src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml b/src/NuGetGallery/Views/Packages/_ValidationIssue.cshtml
@@ -63,11 +63,16 @@
             The checksum does not match for the dll(s) and corresponding pdb(s).
         </text>
         break;
-    case ValidationIssueCode.SymbolErrorCode_MatchingPortablePDBNotFound:
+    case ValidationIssueCode.SymbolErrorCode_MatchingAssemblyNotFound:
         <text>
             The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.
         </text>
         break;
+    case ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:
+        <text>
+            The uploaded symbols package contains one or more pdbs that are not portable.
+        </text>
+        break;
     default:
         <text>
             There was an unknown failure when validating your package.

diff --git a/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
@@ -2453,7 +2453,7 @@ public static IEnumerable<object[]> WillSendEmailToAllOwners_Data
                                 {
                                     foreach (var validationIssue in new[] {
                                         ValidationIssue.SymbolErrorCode_ChecksumDoesNotMatch,
-                                        ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound,
+                                        ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound,
                                         ValidationIssue.Unknown
                                        })
                                     {
@@ -2579,8 +2579,10 @@ private static string ParseValidationIssue(ValidationIssue validationIssue, stri
                         return $"The package was signed, but the signing certificate (SHA-1 thumbprint {certIssue.Sha1Thumbprint}) is not associated with your account. You must register this certificate to publish signed packages. [Read more...](https://aka.ms/nuget-signed-ref)";
                     case ValidationIssueCode.SymbolErrorCode_ChecksumDoesNotMatch:
                         return "The checksum does not match for the dll(s) and corresponding pdb(s).";
-                    case ValidationIssueCode.SymbolErrorCode_MatchingPortablePDBNotFound:
+                    case ValidationIssueCode.SymbolErrorCode_MatchingAssemblyNotFound:
                         return "The uploaded symbols package contains pdb(s) for a corresponding dll(s) not found in the nuget package.";
+                    case ValidationIssueCode.SymbolErrorCode_PdbIsNotPortable:
+                        return "The uploaded symbols package contains one or more pdbs that are not portable.";
                     default:
                         return "There was an unknown failure when validating your package.";
                 }

diff --git a/tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs b/tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs
@@ -100,7 +100,8 @@ public static IEnumerable<ValidationIssue> KnownValidationIssues
                 yield return ValidationIssue.AuthorCounterSignaturesNotSupported;
                 yield return ValidationIssue.PackageIsNotSigned;
                 yield return ValidationIssue.SymbolErrorCode_ChecksumDoesNotMatch;
-                yield return ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound;
+                yield return ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound;
+                yield return ValidationIssue.SymbolErrorCode_PdbIsNotPortable;
                 yield return new UnauthorizedCertificateFailure("thumbprint");
             }
         }