Enable timestamp provider test and fix 3 broken tests

test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/SigningTests/SignatureUtilityTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 
 using System;
 using System.Collections.Generic;

test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/SigningTests/SignedPackageArchiveTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;

test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/SigningTests/SigningUtilityTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 
 using System;
 using System.Diagnostics;

test/NuGet.Core.FuncTests/NuGet.Packaging.FuncTest/SigningTests/TimestampProviderTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 
 using System;
 using System.Collections.Generic;
@@ -24,7 +24,11 @@ namespace NuGet.Packaging.FuncTest
     [Collection(SigningTestCollection.Name)]
     public class TimestampProviderTests
     {
+#if IS_DESKTOP
         private const string ArgumentNullExceptionMessage = "Value cannot be null.\r\nParameter name: {0}";
+#else
+        private const string ArgumentNullExceptionMessage = "Value cannot be null. (Parameter '{0}')";
+#endif
         private const string OperationCancelledExceptionMessage = "The operation was canceled.";
 
         private SigningTestFixture _testFixture;
@@ -70,7 +74,7 @@ public async Task GetTimestampAsync_WithValidInput_ReturnsTimestampAsync()
         }
 
         [CIOnlyFact]
-        public async Task GetTimestamp_AssertCompleteChain_SuccessAsync()
+        public async Task GetTimestampAsync_AssertCompleteChain_SuccessAsync()
         {
             var timestampService = await _testFixture.GetDefaultTrustedTimestampServiceAsync();
             var timestampProvider = new Rfc3161TimestampProvider(timestampService.Url);
@@ -157,12 +161,11 @@ public async Task GetTimestampAsync_WhenRequestNull_ThrowsAsync()
                     target: SignaturePlacement.PrimarySignature
                 );
 
-                // Act
-                Action timestampAction = async () => await timestampProvider.GetTimestampAsync(null, logger, CancellationToken.None);
-
                 // Assert
-                timestampAction.ShouldThrow<ArgumentNullException>()
-                    .WithMessage(string.Format(ArgumentNullExceptionMessage, nameof(request)));
+                var exception = await Assert.ThrowsAsync<ArgumentNullException>(
+                    () => timestampProvider.GetTimestampAsync(request : null, logger, CancellationToken.None));
+
+                Assert.Equal(string.Format(ArgumentNullExceptionMessage, nameof(request)), exception.Message);
             }
         }
 
@@ -188,12 +191,11 @@ public async Task GetTimestampAsync_WhenLoggerNull_ThrowsAsync()
                     target: SignaturePlacement.PrimarySignature
                 );
 
-                // Act
-                Action timestampAction = async () => await timestampProvider.GetTimestampAsync(request, null, CancellationToken.None);
-
                 // Assert
-                timestampAction.ShouldThrow<ArgumentNullException>()
-                    .WithMessage(string.Format(ArgumentNullExceptionMessage, "logger"));
+                var exception = await Assert.ThrowsAsync<ArgumentNullException>(
+                    () => timestampProvider.GetTimestampAsync(request, logger : null, CancellationToken.None));
+
+                Assert.Equal(string.Format(ArgumentNullExceptionMessage, "logger"), exception.Message);
             }
         }
 
@@ -220,12 +222,11 @@ public async Task GetTimestampAsync_WhenCancelled_ThrowsAsync()
                    target: SignaturePlacement.PrimarySignature
                );
 
-                // Act
-                Action timestampAction = async () => await timestampProvider.GetTimestampAsync(request, logger, new CancellationToken(canceled: true));
-
                 // Assert
-                timestampAction.ShouldThrow<OperationCanceledException>()
-                    .WithMessage(OperationCancelledExceptionMessage);
+                var exception = await Assert.ThrowsAsync<OperationCanceledException>(
+                    () => timestampProvider.GetTimestampAsync(request, logger, new CancellationToken(canceled: true)));
+
+                Assert.Equal(OperationCancelledExceptionMessage, exception.Message);
             }
         }
 

test/NuGet.Core.Tests/NuGet.Commands.Test/RestoreCommandTests.cs

@@ -969,7 +969,7 @@ public async Task RestoreCommand_ImportsNoMatchAsync()
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public async Task RestoreCommand_InvalidSignedPackageAsync()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/PackageArchiveReaderTests.cs

@@ -1597,7 +1597,7 @@ await Assert.ThrowsAsync<NotImplementedException>(
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public async Task ValidateIntegrityAsync_WhenSignatureContentNull_Throws()
         {
@@ -1835,7 +1835,7 @@ public void GetContentHash_UnsignedPackage_WhenGivingAFallbackFunctionThatReturn
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [CIOnlyFact]
         public async Task GetContentHash_IsSameForUnsignedAndSignedPackageAsync()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/AttributeUtilityTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.Linq;
 using System.Security.Cryptography;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/EssCertIdTests.cs

@@ -36,7 +36,7 @@ public void Read_WithInvalidAsn1_Throws()
                 () => EssCertId.Read(new byte[] { 0x30, 0x0b }));
         }
 
-#if !IS_CORECLR
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void Read_WithValidInput_ReturnsEssCertId()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/EssCertIdV2Tests.cs

@@ -168,7 +168,7 @@ public void Read_WithNonDefaultAlgorithmIdentifier_ReturnsEssCertIdV2()
             SigningTestUtility.VerifyByteArrays(bcIssuerSerial.Serial.Value.ToByteArray(), essCertIdV2.IssuerSerial.SerialNumber);
         }
 
-#if !IS_CORECLR
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void Read_WithValidInput_ReturnsEssCertId()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/PrimarySignatureTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.Security.Cryptography.Pkcs;
 using System.Security.Cryptography.X509Certificates;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/ReadOnlyBufferedStreamTests.cs

@@ -249,7 +249,7 @@ public void WriteTimeout_Setter_SetsValueOnUnderlyingStream()
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void Close_WhenLeaveOpenFalse_DisposesUnderlyingStream()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/RepositoryCountersignatureTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.Collections.Generic;
 using System.Linq;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SignatureTrustAndValidityVerificationProviderTests.cs

@@ -14,7 +14,7 @@ namespace NuGet.Packaging.Test
 {
     public class SignatureTrustAndValidityVerificationProviderTests
     {
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         private static readonly Lazy<PrimarySignature> _signature = new Lazy<PrimarySignature>(
             () => PrimarySignature.Load(SigningTestUtility.GetResourceBytes(".signature.p7s")));
 #endif
@@ -25,7 +25,7 @@ public SignatureTrustAndValidityVerificationProviderTests()
             _provider = new SignatureTrustAndValidityVerificationProvider();
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public async Task GetTrustResultAsync_WhenPackageIsNull_Throws()
         {
@@ -53,7 +53,7 @@ public async Task GetTrustResultAsync_WhenSignatureIsNull_Throws()
             Assert.Equal("signature", exception.ParamName);
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public async Task GetTrustResultAsync_WhenSettingsIsNull_Throws()
         {

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SignatureUtilityTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.IO;
 using System.Threading;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SignedPackageArchiveIOUtilityTests.cs

@@ -165,7 +165,7 @@ public void ReadAndHashUntilPosition_WhenPositionBeforeCurrentReadPosition_Throw
             }
         }
 
-#if !IS_CORECLR
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void ReadAndHashUntilPosition_WhenPositionAtStart_ReadsAndHashes()
         {
@@ -248,7 +248,7 @@ public void HashBytes_WhenBytesNullOrEmpty_Throws(byte[] bytes)
             }
         }
 
-#if !IS_CORECLR
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void HashBytes_WithInputBytes_Hashes()
         {
@@ -486,7 +486,7 @@ protected override void Dispose(bool disposing)
 
             internal string GetHash()
             {
-#if !IS_CORECLR
+#if IS_SIGNING_SUPPORTED
                 HashAlgorithm.TransformFinalBlock(new byte[0], inputOffset: 0, inputCount: 0);
 
                 return Convert.ToBase64String(HashAlgorithm.Hash);

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SignedPackageArchiveTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SignedPackageArchiveUtilityTests.cs

@@ -257,7 +257,7 @@ public void GetPackageContentHash_WithCompressedSignatureFileEntry_NotThrows()
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public async Task RemoveRepositorySignaturesAsync_WithNullInput_Throws()
         {
@@ -542,7 +542,7 @@ public void Dispose()
             }
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         private sealed class RemoveTest : IDisposable
         {
             private bool _isDisposed;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningOptionsTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System;
 using System.IO;
 using Moq;

test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningUtilityTests.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
 using System.Security.Cryptography.Pkcs;
 #endif
 using System.Security.Cryptography.X509Certificates;
@@ -159,7 +159,7 @@ public void Verify_WithUntrustedSelfSignedCertificate_Succeeds()
 
         }
 
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         [Fact]
         public void CreateSignedAttributes_SignPackageRequest_WhenRequestNull_Throws()
         {

test/TestUtilities/Test.Utility/Signing/SigningTestUtility.cs

@@ -496,7 +496,7 @@ public static SignedCms GenerateSignedCms(X509Certificate2 cert, byte[] content)
 
             return cms;
         }
-#if IS_DESKTOP
+#if IS_SIGNING_SUPPORTED
         /// <summary>
         /// Generates a SignedCMS object for some content.
         /// </summary>