More Improvements:

- Fix warnings when building nuspec - Move restore method to SqlSetupStrategy
dotnet · Oct 16, 2019 · 90c1adb · 90c1adb
1 parent 014865d
commit 90c1adb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/build.proj b/build.proj
@@ -43,8 +43,8 @@
   <Target Name="Restore"                   DependsOnTargets="RestoreNetCore;RestoreNetFx" />
   <Target Name="BuildAll"                  DependsOnTargets="BuildNetFx;BuildNetCore" />
   <Target Name="BuildAllConfigurations"    DependsOnTargets="BuildNetFx;BuildNetCoreAllOS;GenerateNugetPackage" />
-  <Target Name="BuildTestsNetCore"         DependsOnTargets="BuildFunctionalTestsNetCore;BuildManualTestsNetCore" />
-  <Target Name="BuildTestsNetFx"           DependsOnTargets="BuildFunctionalTestsNetFx;BuildManualTestsNetFx" />
+  <Target Name="BuildTestsNetCore"         DependsOnTargets="BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore" />
+  <Target Name="BuildTestsNetFx"           DependsOnTargets="BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" />
 
   <Target Name="RestoreNetCore">
     <PropertyGroup>

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
@@ -13,13 +13,6 @@ public class AKVTest : IClassFixture<SQLSetupStrategy>, IDisposable
 
         public AKVTest(SQLSetupStrategy fixture)
         {
-            Dictionary<string, SqlColumnEncryptionKeyStoreProvider> customAkvKeyStoreProviders = new Dictionary<string, SqlColumnEncryptionKeyStoreProvider>(capacity: 1, comparer: StringComparer.OrdinalIgnoreCase)
-                {
-                    {SqlColumnEncryptionAzureKeyVaultProvider.ProviderName, fixture.akvStoreProvider}
-                };
-
-            SqlConnection.RegisterColumnEncryptionKeyStoreProviders(customProviders: customAkvKeyStoreProviders);
-
             this.fixture = fixture;
             tableName = fixture.AKVTestTable.Name;
 

diff --git a/...crosoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs b/...crosoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs
@@ -36,6 +36,13 @@ public SQLSetupStrategy()
             certStoreProvider = new SqlColumnEncryptionCertificateStoreProvider();
             akvStoreProvider = new SqlColumnEncryptionAzureKeyVaultProvider(authenticationCallback: authenticationCallback);
             SetupDatabase();
+
+            Dictionary<string, SqlColumnEncryptionKeyStoreProvider> customAkvKeyStoreProviders = new Dictionary<string, SqlColumnEncryptionKeyStoreProvider>(capacity: 1, comparer: StringComparer.OrdinalIgnoreCase)
+                {
+                    {SqlColumnEncryptionAzureKeyVaultProvider.ProviderName, akvStoreProvider}
+                };
+
+            SqlConnection.RegisterColumnEncryptionKeyStoreProviders(customProviders: customAkvKeyStoreProviders);
         }
 
         protected SQLSetupStrategy(string customKeyPath) => keyPath = customKeyPath;

diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -8,7 +8,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://aka.ms/sqlclientproject</projectUrl>
-    <iconUrl>https://go.microsoft.com/fwlink/?linkid=2090301</iconUrl>
+    <icon>dotnet.png</icon>
     <description>Always Encrypted Azure Key Vault Provider for Microsoft.Data.SqlClient.
 
 Available Types:
@@ -38,6 +38,8 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
     </frameworkAssemblies>
   </metadata>
   <files>
+    <file src="..\..\icons\dotnet.png" target="" />
+
     <!--  NetFx Files  -->
     <!--file src="..\..\..\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="ref\net46\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="ref\net46\" exclude="" />