Small cosmetic changes to address Jared

Azure · Oct 19, 2017 · 5a5e426 · 5a5e426
1 parent 210d83d
commit 5a5e426
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj b/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj
@@ -4,7 +4,7 @@
     <PackageId>Microsoft.Azure.Management.Sql</PackageId>
     <Description>Azure SQL Management SDK library</Description>
     <AssemblyName>Microsoft.Azure.Management.Sql</AssemblyName>
-    <VersionPrefix>1.9.0-preview</VersionPrefix>
+    <VersionPrefix>1.8.0-preview</VersionPrefix>
     <PackageTags>Microsoft Azure SQL Management;SQL;SQL Management</PackageTags>
   </PropertyGroup>
   <PropertyGroup>
@@ -13,6 +13,7 @@
       <![CDATA[
 New features:
 - Added support for state and migration flag properties for SQL Vnet rules
+- Added support for Server DNS Alias feature
       ]]>
     </PackageReleaseNotes>
   </PropertyGroup>

diff --git a/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs b/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyTitle("Microsoft Azure SQL Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure SQL.")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]
 
 
 

diff --git a/src/SDKs/SqlManagement/Sql.Tests/ServerDnsAliasCrudScenarioTests.cs b/src/SDKs/SqlManagement/Sql.Tests/ServerDnsAliasCrudScenarioTests.cs
@@ -32,7 +32,7 @@ public void TestCrudServerDnsAlias()
                 // Create server dns alias pointing to sourceServer
                 //
                 var serverDnsAlias = sqlClient.ServerDnsAliases.CreateOrUpdate(resourceGroup.Name, sourceServer.Name, serverDnsAliasName);
-                SqlManagementTestUtilities.ValidateServerDnsAlias(serverDnsAlias, serverDnsAliasName);
+                ValidateServerDnsAlias(serverDnsAlias, serverDnsAliasName);
 
                 // List server dns aliases on source server and verify
                 //
@@ -43,7 +43,12 @@ public void TestCrudServerDnsAlias()
 
                 // Update server to which alias is pointing
                 //
-                var serverDnsAliasAcquisitonParams = new ServerDnsAliasAcquisition(String.Format("/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Sql/servers/{2}/dnsAliases/{3}", sqlClient.SubscriptionId, resourceGroup.Name, sourceServer.Name, serverDnsAliasName));
+                var serverDnsAliasAcquisitonParams = new ServerDnsAliasAcquisition(String.Format(
+                    "/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Sql/servers/{2}/dnsAliases/{3}", 
+                    sqlClient.SubscriptionId, 
+                    resourceGroup.Name, 
+                    sourceServer.Name, 
+                    serverDnsAliasName));
 
                 sqlClient.ServerDnsAliases.Acquire(resourceGroup.Name, targetServer.Name, serverDnsAliasName, serverDnsAliasAcquisitonParams);
 
@@ -56,5 +61,12 @@ public void TestCrudServerDnsAlias()
 
             }
         }
+
+        private void ValidateServerDnsAlias(ServerDnsAlias actual, string name)
+        {
+            Assert.NotNull(actual);
+            Assert.NotNull(actual.Id);
+            Assert.Equal(name, actual.Name);
+        }
     }
 }
diff --git a/src/SDKs/SqlManagement/Sql.Tests/Utilities/SqlManagementTestUtilities.cs b/src/SDKs/SqlManagement/Sql.Tests/Utilities/SqlManagementTestUtilities.cs
@@ -288,14 +288,7 @@ public static void ValidateVirtualNetworkRule(VirtualNetworkRule expected, Virtu
             Assert.Equal(expected.VirtualNetworkSubnetId, actual.VirtualNetworkSubnetId);
         }
 
-        public static void ValidateServerDnsAlias(ServerDnsAlias actual, string name)
-        {
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Id);
-            Assert.Equal(name, actual.Name);
-        }
-
-		internal static Task<Database[]> CreateDatabasesAsync(
+        internal static Task<Database[]> CreateDatabasesAsync(
             SqlManagementClient sqlClient,
             string resourceGroupName,
             Server server,