Fixing Merge conflicts

Fixing Merge conflicts

Author: dominiqa

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

@@ -64,14 +64,9 @@
     <Reference Include="Microsoft.Azure.Gallery">
       <HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
     </Reference>
-<<<<<<< HEAD
     <Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.34.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
       <Private>True</Private>
-=======
-    <Reference Include="Microsoft.Azure.Management.Sql">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.32.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
->>>>>>> c8ed539f0c0e8dbb5f7ac6feddd3e9cbd4680edf
     </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>

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

@@ -6,13 +6,8 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
-<<<<<<< HEAD
-  <package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Sql" version="0.34.0-prerelease" targetFramework="net45" />
-=======
   <package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.32.0-prerelease" targetFramework="net45" />
->>>>>>> c8ed539f0c0e8dbb5f7ac6feddd3e9cbd4680edf
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5687.28567-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5687.28567-prerelease" targetFramework="net45" />

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

@@ -108,12 +108,6 @@
     <Compile Include="ServiceTierAdvisor\Model\UpgradeServerHint.cs" />
     <Compile Include="ServiceTierAdvisor\Services\AzureSqlServiceTierAdvisorAdapter.cs" />
     <Compile Include="ServiceTierAdvisor\Services\AzureSqlServiceTierAdvisorCommunicator.cs" />
-<<<<<<< HEAD
-    <Compile Include="Database Activation\Cmdlet\AzureSqlDatabaseActivationCmdletBase.cs" />
-    <Compile Include="Database Activation\Cmdlet\ResumeAzureSqlDatabase.cs" />
-    <Compile Include="Database Activation\Cmdlet\SuspendAzureSqlDatabase.cs" />
-    <Compile Include="Database Activation\Services\SqlAzureDatabaseActivationAdapter.cs" />
-    <Compile Include="Database Activation\Services\SqlAzureDatabaseActivationCommunicator.cs" />
     <Compile Include="Replication\Cmdlet\AzureSqlDatabaseCopyCmdletBase.cs" />
     <Compile Include="Replication\Cmdlet\AzureSqlDatabaseSecondaryCmdletBase.cs" />
     <Compile Include="Replication\Cmdlet\GetAzureSqlDatabaseReplicationLink.cs" />
@@ -127,8 +121,6 @@
     <Compile Include="Replication\Model\LinkType.cs" />
     <Compile Include="Replication\Services\AzureSqlDatabaseReplicationAdapter.cs" />
     <Compile Include="Replication\Services\AzureSqlDatabaseReplicationCommunicator.cs" />
-=======
->>>>>>> c8ed539f0c0e8dbb5f7ac6feddd3e9cbd4680edf
     <Compile Include="TransparentDataEncryption\Cmdlet\AzureSqlDatabaseTransparentDataEncryptionActivityCmdletBase.cs" />
     <Compile Include="TransparentDataEncryption\Cmdlet\AzureSqlDatabaseTransparentDataEncryptionCmdletBase.cs" />
     <Compile Include="TransparentDataEncryption\Cmdlet\GetAzureSqlDatabaseTransparentDataEncryption.cs" />
@@ -225,17 +217,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
     </Reference>
-<<<<<<< HEAD
-=======
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.1.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Sql">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.32.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
->>>>>>> c8ed539f0c0e8dbb5f7ac6feddd3e9cbd4680edf
     <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>

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

@@ -4,13 +4,8 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-<<<<<<< HEAD
-  <package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Sql" version="0.34.0-prerelease" targetFramework="net45" />
-=======
   <package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.32.0-prerelease" targetFramework="net45" />
->>>>>>> c8ed539f0c0e8dbb5f7ac6feddd3e9cbd4680edf
   <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" />