Merge pull request Azure#1233 from akromm/dev

Adding FreeDB edition and updating nuget package version.

Author: markcowl

src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

@@ -262,14 +262,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.39.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.40.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
     </Reference>

src/ResourceManager/Sql/Commands.Sql/Database/Model/DatabaseEdition.cs

@@ -42,7 +42,12 @@ public enum DatabaseEdition
         /// <summary>
         /// Azure SQL Data Warehouse database edition
         /// </summary>
-        DataWarehouse = 6
+        DataWarehouse = 6,
+
+        /// <summary>
+        /// Free database edition.  Reserved for special use cases/scenarios.
+        /// </summary>
+        Free = 7,
     }
 }
 

src/ResourceManager/Sql/Commands.Sql/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.39.0-prerelease" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Sql" version="0.40.0-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />