Update nuget

novotnyllc · Nov 15, 2018 · 919247a · 919247a
1 parent ae0845e
commit 919247a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.8" />
-    <PackageReference Include="NuGet.Packaging" Version="5.0.0-xprivate02.36848" />
+    <PackageReference Include="NuGet.Packaging" Version="5.0.0-xprivate.48840" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.3.37" />
     <PackageReference Include="RSAKeyVaultProvider" Version="1.1.22" />
   </ItemGroup>

diff --git a/NuGetKeyVaultSignTool.Core/VerifyCommand.cs b/NuGetKeyVaultSignTool.Core/VerifyCommand.cs
@@ -37,7 +37,12 @@ public async Task<bool> VerifyAsync(string file, StringBuilder buffer)
                 throw new ArgumentNullException(nameof(buffer));
             }
 
-            var trustProviders = SignatureVerificationProviderFactory.GetSignatureVerificationProviders();
+
+            var trustProviders = new ISignatureVerificationProvider[]
+            {
+                new IntegrityVerificationProvider(),
+                new SignatureTrustAndValidityVerificationProvider()
+            };
             var verifier = new PackageSignatureVerifier(trustProviders);
             try
             {
@@ -47,9 +52,9 @@ public async Task<bool> VerifyAsync(string file, StringBuilder buffer)
                     var verificationResult = await verifier.VerifySignaturesAsync(package, SignedPackageVerifierSettings.GetVerifyCommandDefaultPolicy(), CancellationToken.None);
 
 
-                    if (verificationResult.Valid)
+                    if (verificationResult.IsValid)
                     {
-                        return verificationResult.Valid;
+                        return verificationResult.IsValid;
                     }
                     else
                     {