Merge release/keyvault-4.1.0 into master

sdk/keyvault/Azure.Security.KeyVault.Certificates/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Release History
 
-## 4.1.0-preview.2 (Unreleased)
+## 4.2.0-preview.1 (Unreleased)
 
-## 4.1.0-preview.1 (2020-03-09)
+## 4.1.0 (2020-08-11)
 
 ### Added
 
-- Add `RecoverableDays` property to `CertificateProperties`.
+- Added `RecoverableDays` property to `CertificateProperties`.
+
+### Changed
+
+- Default service version is now 7.1.
 
 ## 4.0.3 (2020-07-09)
 
@@ -22,6 +26,12 @@
 
 - Fixed concurrency issue in our challenge-based authentication policy ([#9737](https://github.com/Azure/azure-sdk-for-net/issues/9737))
 
+## 4.1.0-preview.1 (2020-03-09)
+
+### Added
+
+- Add `RecoverableDays` property to `CertificateProperties`.
+
 ## 4.0.1 (2020-03-03)
 
 ### Fixed

sdk/keyvault/Azure.Security.KeyVault.Certificates/api/Azure.Security.KeyVault.Certificates.netstandard2.0.cs

@@ -69,12 +69,12 @@ public CertificateClient(System.Uri vaultUri, Azure.Core.TokenCredential credent
     }
     public partial class CertificateClientOptions : Azure.Core.ClientOptions
     {
-        public CertificateClientOptions(Azure.Security.KeyVault.Certificates.CertificateClientOptions.ServiceVersion version = Azure.Security.KeyVault.Certificates.CertificateClientOptions.ServiceVersion.V7_1_Preview) { }
+        public CertificateClientOptions(Azure.Security.KeyVault.Certificates.CertificateClientOptions.ServiceVersion version = Azure.Security.KeyVault.Certificates.CertificateClientOptions.ServiceVersion.V7_1) { }
         public Azure.Security.KeyVault.Certificates.CertificateClientOptions.ServiceVersion Version { get { throw null; } }
         public enum ServiceVersion
         {
             V7_0 = 0,
-            V7_1_Preview = 1,
+            V7_1 = 1,
         }
     }
     public partial class CertificateContact

sdk/keyvault/Azure.Security.KeyVault.Certificates/src/Azure.Security.KeyVault.Certificates.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <Description>This is the Microsoft Azure Key Vault Certificates client library</Description>
     <AssemblyTitle>Microsoft Azure.Security.KeyVault.Certificates client library</AssemblyTitle>
-    <Version>4.1.0-preview.2</Version>
-    <ApiCompatVersion>4.0.3</ApiCompatVersion>
+    <Version>4.2.0-preview.1</Version>
+    <ApiCompatVersion>4.1.0</ApiCompatVersion>
     <PackageTags>Microsoft Azure Key Vault Certificates;$(PackageCommonTags)</PackageTags>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <NoWarn>$(NoWarn);3021</NoWarn>

sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClientOptions.cs

@@ -16,7 +16,7 @@ public class CertificateClientOptions : ClientOptions
         /// For more information, see
         /// <see href="https://docs.microsoft.com/rest/api/keyvault/key-vault-versions">Key Vault versions</see>.
         /// </summary>
-        internal const ServiceVersion LatestVersion = ServiceVersion.V7_1_Preview;
+        internal const ServiceVersion LatestVersion = ServiceVersion.V7_1;
 
         /// <summary>
         /// The versions of Azure Key Vault supported by this client
@@ -31,9 +31,9 @@ public enum ServiceVersion
             V7_0 = 0,
 
             /// <summary>
-            /// The Key Vault API version 7.1-preview.
+            /// They Key Vault API version 7.1.
             /// </summary>
-            V7_1_Preview,
+            V7_1 = 1,
 #pragma warning restore CA1707 // Identifiers should not contain underscores
         }
 
@@ -64,8 +64,7 @@ internal string GetVersionString()
             return Version switch
             {
                 ServiceVersion.V7_0 => "7.0",
-                ServiceVersion.V7_1_Preview => "7.1-preview",
-
+                ServiceVersion.V7_1 => "7.1",
                 _ => throw new ArgumentException(Version.ToString()),
             };
         }

sdk/keyvault/Azure.Security.KeyVault.Certificates/tests/CertificatesTestBase.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
@@ -15,7 +16,7 @@ namespace Azure.Security.KeyVault.Certificates.Tests
 {
     [ClientTestFixture(
         CertificateClientOptions.ServiceVersion.V7_0,
-        CertificateClientOptions.ServiceVersion.V7_1_Preview)]
+        CertificateClientOptions.ServiceVersion.V7_1)]
     [NonParallelizable]
     public class CertificatesTestBase : RecordedTestBase<KeyVaultTestEnvironment>
     {
@@ -29,7 +30,6 @@ public class CertificatesTestBase : RecordedTestBase<KeyVaultTestEnvironment>
         // Queue deletes, but poll on the top of the purge stack to increase likelihood of others being purged by then.
         private readonly ConcurrentQueue<string> _certificatesToDelete = new ConcurrentQueue<string>();
         private readonly ConcurrentStack<string> _certificatesToPurge = new ConcurrentStack<string>();
-
         private readonly ConcurrentQueue<string> _issuerToDelete = new ConcurrentQueue<string>();
         private readonly ConcurrentQueue<IEnumerable<CertificateContact>> _contactsToDelete = new ConcurrentQueue<IEnumerable<CertificateContact>>();
 
@@ -44,11 +44,19 @@ internal CertificateClient GetClient(TestRecording recording = null)
         {
             recording ??= Recording;
 
+            CertificateClientOptions options = new CertificateClientOptions(_serviceVersion)
+            {
+                Diagnostics =
+                {
+                    IsLoggingContentEnabled = Debugger.IsAttached,
+                }
+            };
+
             return InstrumentClient
                 (new CertificateClient(
                     new Uri(TestEnvironment.KeyVaultUrl),
                     TestEnvironment.Credential,
-                    recording.InstrumentClientOptions(new CertificateClientOptions(_serviceVersion))));
+                    recording.InstrumentClientOptions(options)));
         }
 
         public override void StartTestRecording()