Skip to content

Commit 5ef2653

Browse files
committed
Revert "PR for SQL Database Replication Cmdlets"
1 parent e69d502 commit 5ef2653

39 files changed

+14
-43348
lines changed

setup/azurecmdfiles.wxi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2122,9 +2122,6 @@
21222122
<Component Id="cmp499092B04619C0EDE4686B78E1128605" Guid="*">
21232123
<File Id="fil9E595049BBFB9413DD757D01D9D71D3E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.dll-Help.xml" />
21242124
</Component>
2125-
<Component Id="cmpF23457BA331434DDB0815F84746FD1E7" Guid="*">
2126-
<File Id="fil1972DDA29C9A5FC7D61122B5F5E1D84B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml" />
2127-
</Component>
21282125
<Component Id="cmp4345BAF62C4935A6C763E439913D5EF1" Guid="*">
21292126
<File Id="fil7A2E85A4308692430EBF0FF8501B017A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Common.Authentication.dll" />
21302127
</Component>
@@ -5634,7 +5631,6 @@
56345631
<ComponentRef Id="cmp5746A3BAD258D8EA1473730146C01F1D" />
56355632
<ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
56365633
<ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />
5637-
<ComponentRef Id="cmpF23457BA331434DDB0815F84746FD1E7" />
56385634
<ComponentRef Id="cmp4345BAF62C4935A6C763E439913D5EF1" />
56395635
<ComponentRef Id="cmpDA20E40FD1BE07A113851AFDBA89787D" />
56405636
<ComponentRef Id="cmp2C144B41FAE124CE1C9921E8B7DB9776" />

src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ ScriptsToProcess = @()
5555

5656
# Type files (.ps1xml) to be loaded when importing this module
5757
TypesToProcess = @(
58-
'.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml',
59-
'.\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml'
58+
'.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml'
6059
)
6160

6261
# Format files (.ps1xml) to be loaded when importing this module

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5353
</Reference>
54+
<Reference Include="Microsoft.Azure.Management.Sql">
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.29.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
56+
</Reference>
5457
<Reference Include="Microsoft.Azure.Common">
5558
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5659
</Reference>
@@ -64,9 +67,8 @@
6467
<Reference Include="Microsoft.Azure.Gallery">
6568
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
6669
</Reference>
67-
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.34.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
69-
<Private>True</Private>
70+
<Reference Include="Microsoft.Azure.Management.Sql">
71+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.32.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
7072
</Reference>
7173
<Reference Include="Microsoft.Azure.Management.Storage">
7274
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -183,12 +185,8 @@
183185
</Compile>
184186
<Compile Include="ScenarioTests\DatabaseActivationTests.cs" />
185187
<Compile Include="ScenarioTests\DatabaseBackupTests.cs" />
186-
<Compile Include="ScenarioTests\DatabaseReplicationTests.cs" />
187188
<Compile Include="ScenarioTests\DatabaseCrudTests.cs" />
188189
<Compile Include="ScenarioTests\DataMaskingTests.cs" />
189-
<None Include="ScenarioTests\DatabaseReplicationTests.ps1">
190-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191-
</None>
192190
<None Include="ScenarioTests\ServiceTierAdvisorTests.ps1">
193191
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
194192
</None>
@@ -408,14 +406,6 @@
408406
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdateV2.json">
409407
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
410408
</None>
411-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateDatabaseCopy.json" />
412-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateDatabaseCopyV2.json" />
413-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateSecondaryDatabase.json" />
414-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestCreateSecondaryDatabaseV2.json" />
415-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestGetReplicationLink.json" />
416-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestGetReplicationLinkV2.json" />
417-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestRemoveSecondaryDatabase.json" />
418-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests\TestRemoveSecondaryDatabaseV2.json" />
419409
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolCreate.json">
420410
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
421411
</None>

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ function Get-ElasticPoolName
158158
.SYNOPSIS
159159
Creates a resource group for tests
160160
#>
161-
function Create-ResourceGroupForTest ($location = "Japan East")
161+
function Create-ResourceGroupForTest ()
162162
{
163+
$location = "Japan East"
163164
$rgName = Get-ResourceGroupName
164165

165166
$rg = New-AzureResourceGroup -Name $rgName -Location $location

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)