Skip to content

Commit 801d736

Browse files
author
jasper-schneider
committed
Merge remote-tracking branch 'upstream/dev' into autoscale
2 parents 496c68d + 29f9629 commit 801d736

File tree

80 files changed

+128
-43711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+128
-43711
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 276 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@
187187
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
188188
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
189189
</Target>
190-
</Project>
190+
</Project>

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
<Reference Include="System" />
137137
<Reference Include="System.Core" />
138138
<Reference Include="System.Data.Services.Client" />
139-
<Reference Include="System.IO.Compression.FileSystem" />
140139
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
141140
<Reference Include="System.Net" />
142141
<Reference Include="System.Net.Http" />
@@ -175,8 +174,6 @@
175174
<Compile Include="Common\GeneralTests.cs" />
176175
<Compile Include="Common\IdnUtilitiesTests.cs" />
177176
<Compile Include="Common\JsonUtilitiesTests.cs" />
178-
<Compile Include="Extensions\DSC\DscExtensionConfigurationParsingHelperTests.cs" />
179-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializerTests.cs" />
180177
<Compile Include="Mocks\ClientMocks.cs" />
181178
<Compile Include="Common\PSObjectExtensions.cs" />
182179
<Compile Include="Common\RemoveAzurePublishSettings.cs" />
@@ -314,4 +311,4 @@
314311
</PropertyGroup>
315312
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
316313
</Target>
317-
</Project>
314+
</Project>

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@
7070
<SpecificVersion>False</SpecificVersion>
7171
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7272
</Reference>
73-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
78-
</Reference>
79-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
81-
</Reference>
8273
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8374
<SpecificVersion>False</SpecificVersion>
8475
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -103,9 +94,6 @@
10394
<SpecificVersion>False</SpecificVersion>
10495
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
10596
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Storage">
107-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
108-
</Reference>
10997
<Reference Include="Newtonsoft.Json">
11098
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
11199
<Private>True</Private>
@@ -120,7 +108,6 @@
120108
</Reference>
121109
<Reference Include="System" />
122110
<Reference Include="System.Core" />
123-
<Reference Include="System.IO.Compression.FileSystem" />
124111
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
125112
<Reference Include="System.Net" />
126113
<Reference Include="System.Net.Http" />
@@ -142,9 +129,6 @@
142129
<Reference Include="System.ServiceModel" />
143130
<Reference Include="System.ServiceModel.Channels" />
144131
<Reference Include="System.ServiceModel.Web" />
145-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
147-
</Reference>
148132
<Reference Include="System.Web.Extensions" />
149133
<Reference Include="System.Windows.Forms" />
150134
<Reference Include="System.Xml.Linq" />
@@ -157,14 +141,6 @@
157141
<Compile Include="AzurePowerShell.cs" />
158142
<Compile Include="ComputeCloudException.cs" />
159143
<Compile Include="Constants.cs" />
160-
<Compile Include="Extensions\DSC\DscExtensionCmdletConstants.cs" />
161-
<Compile Include="Extensions\DSC\DscExtensionPrivateSettings.cs" />
162-
<Compile Include="Extensions\DSC\DscExtensionPublicSettings.cs" />
163-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializer.cs" />
164-
<Compile Include="Extensions\DSC\Exceptions\GetDscResourceException.cs" />
165-
<Compile Include="Extensions\DSC\Publish\ConfigurationParseResult.cs" />
166-
<Compile Include="Extensions\DSC\Publish\ConfigurationParsingHelper.cs" />
167-
<Compile Include="Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs" />
168144
<Compile Include="Properties\Resources.Designer.cs">
169145
<AutoGen>True</AutoGen>
170146
<DesignTime>True</DesignTime>
@@ -219,4 +195,4 @@
219195
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
220196
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
221197
</Target>
222-
</Project>
198+
</Project>

‎src/Common/Commands.Common/packages.config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
1512
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1613
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1714
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1815
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
1916
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2017
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
21-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
22-
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
2318
</packages>

‎src/Common/Commands.Profile/Profile/NewAzureProfile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ private void InitializeAzureProfile(AzureProfile profile, string parameterSet, A
175175
var servicePrincipalAccount = new AzureAccount
176176
{
177177
Id = settings.Credential.UserName,
178-
Type = AzureAccount.AccountType.ServicePrincipal
178+
Type = AzureAccount.AccountType.ServicePrincipal,
179179
};
180+
servicePrincipalAccount.SetOrAppendProperty(AzureAccount.Property.Tenants, settings.Tenant);
180181
profileClient.InitializeProfile(settings.Environment, new Guid(settings.SubscriptionId),
181182
servicePrincipalAccount,
182183
settings.Credential.Password, settings.StorageAccount);

‎src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,15 @@ function Run-ServiceExtensionSetCmdletTests
484484
try
485485
{
486486
# New-AzureDeployment (in Azure.psd1)
487-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
487+
$testMode = Get-ComputeTestMode;
488+
if ($testMode.ToLower() -ne 'playback')
489+
{
490+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
491+
}
492+
else
493+
{
494+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
495+
}
488496
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
489497

490498
# Staging 1st
@@ -538,7 +546,15 @@ function Run-ServiceDeploymentExtensionCmdletTests
538546
try
539547
{
540548
# New-AzureDeployment (in Azure.psd1)
541-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
549+
$testMode = Get-ComputeTestMode;
550+
if ($testMode.ToLower() -ne 'playback')
551+
{
552+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
553+
}
554+
else
555+
{
556+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
557+
}
542558
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
543559

544560
$rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role WebRole1

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@
244244
<Target Name="AfterBuild">
245245
</Target>
246246
-->
247-
</Project>
247+
</Project>

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,30 @@
171171
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
172172
</ItemGroup>
173173
<ItemGroup>
174+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionCmdletConstants.cs">
175+
<Link>Extension\DSC\DscExtensionCmdletConstants.cs</Link>
176+
</Compile>
177+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionPrivateSettings.cs">
178+
<Link>Extension\DSC\DscExtensionPrivateSettings.cs</Link>
179+
</Compile>
180+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionPublicSettings.cs">
181+
<Link>Extension\DSC\DscExtensionPublicSettings.cs</Link>
182+
</Compile>
183+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionSettingsSerializer.cs">
184+
<Link>Extension\DSC\DscExtensionSettingsSerializer.cs</Link>
185+
</Compile>
186+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Exceptions\GetDscResourceException.cs">
187+
<Link>Extension\DSC\GetDscResourceException.cs</Link>
188+
</Compile>
189+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParseResult.cs">
190+
<Link>Extension\DSC\ConfigurationParseResult.cs</Link>
191+
</Compile>
192+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParsingHelper.cs">
193+
<Link>Extension\DSC\ConfigurationParsingHelper.cs</Link>
194+
</Compile>
195+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs">
196+
<Link>Extension\DSC\DscExtensionPublishCmdletCommonBase.cs</Link>
197+
</Compile>
174198
<Compile Include="AvailabilitySets\RemoveAzureAvailabilitySetCommand.cs" />
175199
<Compile Include="AvailabilitySets\GetAzureAvailabilitySetCommand.cs" />
176200
<Compile Include="AvailabilitySets\NewAzureAvailabilitySetCommand.cs" />
@@ -345,4 +369,4 @@
345369
<Target Name="AfterBuild">
346370
</Target>
347371
-->
348-
</Project>
372+
</Project>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,4 +327,4 @@
327327
<Target Name="AfterBuild">
328328
</Target>
329329
-->
330-
</Project>
330+
</Project>

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,4 @@
275275
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
276276
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
277277
</Target>
278-
</Project>
278+
</Project>

‎src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@
273273
<Target Name="AfterBuild">
274274
</Target>
275275
-->
276-
</Project>
276+
</Project>

‎src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
<SpecificVersion>False</SpecificVersion>
9999
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
100100
</Reference>
101-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
101+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102102
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
103+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
104104
</Reference>
105-
<Reference Include="System" />
105+
<Reference Include="System" />
106106
<Reference Include="System.Core" />
107107
<Reference Include="System.Data" />
108108
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -240,4 +240,4 @@
240240
<Target Name="AfterBuild">
241241
</Target>
242242
-->
243-
</Project>
243+
</Project>

‎src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,4 +433,4 @@
433433
<Target Name="AfterBuild">
434434
</Target>
435435
-->
436-
</Project>
436+
</Project>

‎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/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<Reference Include="Microsoft.Azure.ResourceManager">
4444
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
</Reference>
4846
<Reference Include="Hyak.Common">
4947
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
5048
</Reference>

‎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

0 commit comments

Comments
 (0)