Bring pnp updates to preview

common/src/Logging.Common.cs

@@ -399,7 +399,6 @@ public static void DumpBuffer(object thisOrContextObject, byte[] buffer, int off
         /// <param name="count">The number of bytes to log.</param>
         /// <param name="memberName">The calling member.</param>
         [NonEvent]
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "Parameters 'thisOrContextObject' and 'memberName' used in NET451; remove when no longer supported.")]
         public static unsafe void DumpBuffer(object thisOrContextObject, IntPtr bufferPtr, int count, [CallerMemberName] string memberName = null)
         {
             Debug.Assert(bufferPtr != IntPtr.Zero);

common/src/device/provisioning/transport/ProvisioningSasBuilder.cs

@@ -103,7 +103,7 @@ public static string BuildSasSignature(string keyName, string key, string target
 
         public static string BuildExpiresOn(TimeSpan timeToLive)
         {
-            DateTime epochTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+            var epochTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
             DateTime expiresOn = DateTime.UtcNow.Add(timeToLive);
             TimeSpan secondsFromBaseTime = expiresOn.Subtract(epochTime);
             long seconds = Convert.ToInt64(secondsFromBaseTime.TotalSeconds, CultureInfo.InvariantCulture);

common/src/service/HttpClientHelper.cs

@@ -882,10 +882,10 @@ internal static HttpMessageHandler CreateDefaultHttpMessageHandler(IWebProxy web
 #pragma warning disable CA2000 // Dispose objects before losing scope (object is returned by this method, so the caller is responsible for disposing it)
 #if NETCOREAPP && !NETCOREAPP2_0 && !NETCOREAPP1_0 && !NETCOREAPP1_1
             // SocketsHttpHandler is only available in netcoreapp2.1 and onwards
-            SocketsHttpHandler httpMessageHandler = new SocketsHttpHandler();
+            var httpMessageHandler = new SocketsHttpHandler();
             httpMessageHandler.SslOptions.EnabledSslProtocols = TlsVersions.Instance.Preferred;
 #else
-            HttpClientHandler httpMessageHandler = new HttpClientHandler();
+            var httpMessageHandler = new HttpClientHandler();
 #if !NET451
             httpMessageHandler.SslProtocols = TlsVersions.Instance.Preferred;
             httpMessageHandler.CheckCertificateRevocationList = TlsVersions.Instance.CertificateRevocationCheck;

common/src/service/IAuthorizationHeaderProvider.cs

@@ -3,7 +3,10 @@
 
 namespace Microsoft.Azure.Devices
 {
-    interface IAuthorizationHeaderProvider
+    /// <summary>
+    /// Gets the authorization header for authenticated requests, regardless of choice of authentication.
+    /// </summary>
+    internal interface IAuthorizationHeaderProvider
     {
         string GetAuthorizationHeader();
     }

common/src/service/StringValidationHelper.cs

@@ -66,9 +66,9 @@ public static bool IsBase64String(string value)
                 return false;
             }
 
-            var lengthNoPadding = value.Length;
+            int lengthNoPadding = value.Length;
             value = value.TrimEnd(Base64Padding);
-            var lengthPadding = value.Length;
+            int lengthPadding = value.Length;
 
             if ((lengthNoPadding - lengthPadding) > 2)
             {

e2e/test/GlobalSuppressions.cs

@@ -0,0 +1,17 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage(
+    "Style",
+    "IDE1006:Naming Styles",
+    Justification = "Missing Async suffix on test method names. Test method names may be misleading when they have the Async suffix. Additionally, not changing test names help to maintain ADO history.",
+    Scope = "module")]
+[assembly: SuppressMessage(
+    "CodeQuality",
+    "IDE0079:Remove unnecessary suppression",
+    Justification = "Each frameworks consider certain suppressions required by other frameworks unnecessary.",
+    Scope = "module")]

e2e/test/config/TestConfiguration.IoTHub.cs

@@ -59,39 +59,39 @@ public static string GetIotHubSharedAccessSignature(TimeSpan timeToLive)
             public static X509Certificate2 GetCertificateWithPrivateKey()
             {
                 const string hubPfxCert = "IOTHUB_X509_PFX_CERTIFICATE";
-                var cert = GetBase64EncodedCertificate(hubPfxCert, defaultValue: string.Empty);
+                X509Certificate2 cert = GetBase64EncodedCertificate(hubPfxCert, defaultValue: string.Empty);
                 Assert.IsTrue(cert.NotAfter > DateTime.UtcNow, $"The X509 cert from {hubPfxCert} has expired.");
                 return cert;
             }
 
             public static X509Certificate2 GetChainDeviceCertificateWithPrivateKey()
             {
                 const string hubPfxCert = "HUB_CHAIN_DEVICE_PFX_CERTIFICATE";
-                var cert = GetBase64EncodedCertificate(hubPfxCert, defaultValue: string.Empty);
+                X509Certificate2 cert = GetBase64EncodedCertificate(hubPfxCert, defaultValue: string.Empty);
                 Assert.IsTrue(cert.NotAfter > DateTime.UtcNow, $"The X509 cert from {hubPfxCert} has expired.");
                 return cert;
             }
 
             public static X509Certificate2 GetRootCACertificate()
             {
                 const string hubCert = "HUB_CHAIN_ROOT_CA_CERTIFICATE";
-                var cert = GetBase64EncodedCertificate(hubCert);
+                X509Certificate2 cert = GetBase64EncodedCertificate(hubCert);
                 Assert.IsTrue(cert.NotAfter > DateTime.UtcNow, $"The X509 cert from {hubCert} has expired.");
                 return cert;
             }
 
             public static X509Certificate2 GetIntermediate1Certificate()
             {
                 const string hubCert = "HUB_CHAIN_INTERMEDIATE1_CERTIFICATE";
-                var cert = GetBase64EncodedCertificate(hubCert);
+                X509Certificate2 cert = GetBase64EncodedCertificate(hubCert);
                 Assert.IsTrue(cert.NotAfter > DateTime.UtcNow, $"The X509 cert from {hubCert} has expired.");
                 return cert;
             }
 
             public static X509Certificate2 GetIntermediate2Certificate()
             {
                 const string hubCert = "HUB_CHAIN_INTERMEDIATE2_CERTIFICATE";
-                var cert = GetBase64EncodedCertificate(hubCert);
+                X509Certificate2 cert = GetBase64EncodedCertificate(hubCert);
                 Assert.IsTrue(cert.NotAfter > DateTime.UtcNow, $"The X509 cert from {hubCert} has expired.");
                 return cert;
             }
@@ -111,7 +111,7 @@ public static X509Certificate2 GetIntermediate2Certificate()
 
             private static string GenerateSasToken(string resourceUri, string sharedAccessKey, TimeSpan timeToLive, string policyName = default)
             {
-                DateTime epochTime = new DateTime(1970, 1, 1);
+                var epochTime = new DateTime(1970, 1, 1);
                 DateTime expiresOn = DateTime.UtcNow.Add(timeToLive);
                 TimeSpan secondsFromEpochTime = expiresOn.Subtract(epochTime);
                 long seconds = Convert.ToInt64(secondsFromEpochTime.TotalSeconds, CultureInfo.InvariantCulture);

e2e/test/helpers/ImportExportHelpers.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Devices.E2ETests.Helpers
+{
+    internal static class ImportExportHelpers
+    {
+        /// <summary>
+        /// Makes a stream compatible for writing to a storage blob of serialized, newline-delimited rows of the specified objects.
+        /// </summary>
+        /// <param name="items">The objects to serialize.</param>
+        public static Stream BuildImportStream<T>(IReadOnlyList<T> items)
+        {
+            var itemsFileSb = new StringBuilder();
+
+            foreach (T item in items)
+            {
+                itemsFileSb.AppendLine(JsonConvert.SerializeObject(item));
+            }
+
+            byte[] itemsFileInBytes = Encoding.Default.GetBytes(itemsFileSb.ToString());
+            return new MemoryStream(itemsFileInBytes);
+        }
+    }
+}

e2e/test/helpers/StorageContainer.cs

@@ -136,7 +136,7 @@ protected virtual void Dispose(bool disposing)
 
         private async Task InitializeAsync()
         {
-            CloudStorageAccount storageAccount = CloudStorageAccount.Parse(TestConfiguration.Storage.ConnectionString);
+            var storageAccount = CloudStorageAccount.Parse(TestConfiguration.Storage.ConnectionString);
             CloudBlobClient cloudBlobClient = storageAccount.CreateCloudBlobClient();
             CloudBlobContainer = cloudBlobClient.GetContainerReference(ContainerName);
             await CloudBlobContainer.CreateIfNotExistsAsync().ConfigureAwait(false);

e2e/test/helpers/TestDevice.cs

@@ -75,7 +75,7 @@ private static async Task<TestDevice> CreateDeviceAsync(TestDeviceType type, str
             string deviceName = "E2E_" + prefix + Guid.NewGuid();
 
             // Delete existing devices named this way and create a new one.
-            using RegistryManager rm = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
+            using var rm = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
             s_logger.Trace($"{nameof(GetTestDeviceAsync)}: Creating device {deviceName} with type {type}.");
 
             Client.IAuthenticationMethod auth = null;

e2e/test/helpers/TestDeviceCallbackHandler.cs

@@ -177,13 +177,11 @@ public async Task WaitForReceiveMessageCallbackAsync(CancellationToken ct)
 
         public async Task SetClientPropertyUpdateCallbackHandlerAsync<T>(string expectedPropName, string componentName = default)
         {
-            string userContext = "myContext";
-
             await _deviceClient
                 .SubscribeToWritablePropertyUpdateRequestsAsync(
-                    (patch, context) =>
+                    patch =>
                     {
-                        _logger.Trace($"{nameof(SetClientPropertyUpdateCallbackHandlerAsync)}: DeviceClient {_testDevice.Id} callback property: WritableProperty: {patch}, {context}");
+                        _logger.Trace($"{nameof(SetClientPropertyUpdateCallbackHandlerAsync)}: DeviceClient {_testDevice.Id} callback property: WritableProperty: {patch}.");
 
                         try
                         {
@@ -193,7 +191,6 @@ await _deviceClient
 
                             isPropertyPresent.Should().BeTrue();
                             propertyFromCollection.Should().BeEquivalentTo((T)ExpectedClientPropertyValue);
-                            context.Should().Be(userContext);
                         }
                         catch (Exception ex)
                         {
@@ -206,8 +203,7 @@ await _deviceClient
                         }
 
                         return Task.FromResult(true);
-                    },
-                    userContext)
+                    })
                 .ConfigureAwait(false);
         }