Skip to content

Commit 504c25b

Browse files
author
jasper-schneider
committed
Merge remote-tracking branch 'upstream/dev' into resize
2 parents 0c5b689 + 5bc82b7 commit 504c25b

File tree

55 files changed

+514
-277
lines changed

Some content is hidden

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

55 files changed

+514
-277
lines changed

‎setup/azurepowershell.sln

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
33
VisualStudioVersion = 12.0.30110.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
56
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
67
ProjectSection(ProjectDependencies) = postProject
78
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -15,10 +16,8 @@ Global
1516
Release|Any CPU = Release|Any CPU
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
20+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
2221
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2322
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2423
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-AvailabilitySet
2525
{
2626
# Common
2727
$loc = 'West US';
28-
New-AzureResourceGroup -Name $rgname -Location $loc;
28+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
2929

3030
$asetName = 'avs' + $rgname;
3131
$nonDefaultUD = 2;

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest1.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function ps_vm_dynamic_test_func_1_pstestrg1016
132132
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134134
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Creating Resource Group';
135-
$st = New-AzureResourceGroup -Location $loc -Name $rgname;
135+
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
138138

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest2.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function ps_vm_dynamic_test_func_2_pstestrg4940
132132
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134134
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Creating Resource Group';
135-
$st = New-AzureResourceGroup -Location $loc -Name $rgname;
135+
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
138138

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest3.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function ps_vm_dynamic_test_func_3_pstestrg575
132132
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134134
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Creating Resource Group';
135-
$st = New-AzureResourceGroup -Location $loc -Name $rgname;
135+
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
138138

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ function ${generated_func_name}
335335
`$st = Write-Verbose `"Running Test ${generated_func_name} - Start `${rgname}, `${loc} & `${vmsize}`";
336336
337337
`$st = Write-Verbose 'Running Test ${generated_func_name} - Creating Resource Group';
338-
`$st = New-AzureResourceGroup -Location `$loc -Name `$rgname;
338+
`$st = New-AzureResourceGroup -Location `$loc -Name `$rgname -Force;
339339
340340
`$vmconfig = create_and_setup_vm_config_object `$loc `$rgname `$vmsize;
341341

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineExtensionTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Test-VirtualMachineExtension
2626
{
2727
# Common
2828
$loc = 'westus';
29-
New-AzureResourceGroup -Name $rgname -Location $loc;
29+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
3030

3131
# VM Profile & Hardware
3232
$vmsize = 'Standard_A2';
@@ -203,7 +203,7 @@ function Test-VirtualMachineCustomScriptExtension
203203
{
204204
# Common
205205
$loc = 'westus';
206-
New-AzureResourceGroup -Name $rgname -Location $loc;
206+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
207207

208208
# VM Profile & Hardware
209209
$vmsize = 'Standard_A4';
@@ -359,7 +359,7 @@ function Test-VirtualMachineAccessExtension
359359
{
360360
# Common
361361
$loc = 'westus';
362-
New-AzureResourceGroup -Name $rgname -Location $loc;
362+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
363363

364364
# VM Profile & Hardware
365365
$vmsize = 'Standard_A4';

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-SingleNetworkInterface
2525
{
2626
# Common
2727
$loc = 'westus';
28-
New-AzureResourceGroup -Name $rgname -Location $loc;
28+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
2929

3030
# VM Profile & Hardware
3131
$vmsize = 'Standard_A2';
@@ -148,7 +148,7 @@ function Test-SingleNetworkInterfaceDnsSettings
148148
{
149149
# Common
150150
$loc = 'westus';
151-
New-AzureResourceGroup -Name $rgname -Location $loc;
151+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
152152

153153
# VM Profile & Hardware
154154
$vmsize = 'Standard_A2';
@@ -255,7 +255,7 @@ function Test-MultipleNetworkInterface
255255
{
256256
# Common
257257
$loc = 'westus';
258-
New-AzureResourceGroup -Name $rgname -Location $loc;
258+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
259259

260260
# VM Profile & Hardware
261261
$vmsize = 'Standard_A4';

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-VirtualMachine
2525
{
2626
# Common
2727
$loc = 'westus';
28-
New-AzureResourceGroup -Name $rgname -Location $loc;
28+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
2929

3030
# VM Profile & Hardware
3131
$vmsize = 'Standard_A4';
@@ -373,7 +373,7 @@ function Test-VirtualMachineSizeAndUsage
373373
{
374374
# Common
375375
$loc = 'westus';
376-
New-AzureResourceGroup -Name $rgname -Location $loc;
376+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
377377

378378
# Availability Set
379379
$asetName = 'aset' + $rgname;
@@ -544,7 +544,7 @@ function Test-VirtualMachinePIRv2
544544
{
545545
# Common
546546
$loc = 'westus';
547-
New-AzureResourceGroup -Name $rgname -Location $loc;
547+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
548548

549549
# VM Profile & Hardware
550550
$vmsize = 'Standard_A4';
@@ -654,7 +654,7 @@ function Test-VirtualMachineCapture
654654
{
655655
# Common
656656
$loc = 'westus';
657-
New-AzureResourceGroup -Name $rgname -Location $loc;
657+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
658658

659659
# VM Profile & Hardware
660660
$vmsize = 'Standard_A4';
@@ -770,7 +770,7 @@ function Test-VirtualMachineDataDisk
770770
{
771771
# Common
772772
$loc = 'westus';
773-
New-AzureResourceGroup -Name $rgname -Location $loc;
773+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
774774

775775
# VM Profile & Hardware
776776
$vmsize = 'Standard_A0';
@@ -851,7 +851,7 @@ function Test-VirtualMachinePlan
851851
{
852852
# Common
853853
$loc = 'westus';
854-
New-AzureResourceGroup -Name $rgname -Location $loc;
854+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
855855

856856
# VM Profile & Hardware
857857
$vmsize = 'Standard_A0';
@@ -935,7 +935,7 @@ function Test-VirtualMachinePlan2
935935
{
936936
# Common
937937
$loc = 'westus';
938-
New-AzureResourceGroup -Name $rgname -Location $loc;
938+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
939939

940940
# VM Profile & Hardware
941941
$vmsize = 'Standard_A0';
@@ -1021,7 +1021,7 @@ function Test-VirtualMachineTags
10211021
{
10221022
# Common
10231023
$loc = 'westus';
1024-
New-AzureResourceGroup -Name $rgname -Location $loc;
1024+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
10251025

10261026
# VM Profile & Hardware
10271027
$vmsize = 'Standard_A0';
@@ -1096,7 +1096,7 @@ function Test-VirtualMachineWithVMAgentAutoUpdate
10961096
{
10971097
# Common
10981098
$loc = 'westus';
1099-
New-AzureResourceGroup -Name $rgname -Location $loc;
1099+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
11001100

11011101
# VM Profile & Hardware
11021102
$vmsize = 'Standard_A4';
@@ -1190,7 +1190,7 @@ function Test-LinuxVirtualMachine
11901190
{
11911191
# Common
11921192
$loc = 'westus';
1193-
New-AzureResourceGroup -Name $rgname -Location $loc;
1193+
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
11941194

11951195
# VM Profile & Hardware
11961196
$vmsize = 'Standard_A4';

‎src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/JTokenExtensions.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ internal static PSObject ToPsObject(this JToken jtoken, ResourceObjectFormat obj
6666
var jobject = (JObject)jtoken;
6767
var psObject = new PSObject();
6868

69-
if (jobject.CanConvertTo<Resource<JToken>>())
70-
{
71-
return jobject.ToResource().ToPsObject(objectFormat);
72-
}
73-
7469
if (!string.IsNullOrWhiteSpace(objectType))
7570
{
7671
psObject.TypeNames.Add(objectType);

‎src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/GetAzureResourceCmdlet.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,11 +578,6 @@ private Task<ResponseWithContinuation<Permission[]>> GetPermissions(string permi
578578
/// <param name="resources">The resource.</param>
579579
private async Task<Resource<JToken>[]> GetPopulatedResource(IEnumerable<Resource<JToken>> resources)
580580
{
581-
if (this.IsResourceGroupLevelResourceGet())
582-
{
583-
return new Resource<JToken>[0];
584-
}
585-
586581
return await resources
587582
.Select(resource => this.GetPopulatedResource(resource))
588583
.WhenAllForAwait()

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public void TestGetResourcesViaPipingFromAnotherResource()
7777
}
7878

7979
[Fact]
80-
[Trait(Category.AcceptanceType, Category.CheckIn)]
8180
public void TestMoveAResourceTest()
8281
{
8382
ResourcesController.NewInstance.RunPsTest("Test-MoveAResource");

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ public void TestDatabaseDataMaskingPolicyEnablementToggling()
2727
RunPowerShellTest("Test-DatabaseDataMaskingPolicyEnablementToggling");
2828
}
2929

30-
[Fact(Skip = "Test executes for long time period")]
30+
[Fact]
3131
[Trait(Category.RunType, Category.LiveOnly)]
32-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3332
public void TestDatabaseDataMaskingLevelChanges()
3433
{
3534
RunPowerShellTest("Test-DatabaseDataMaskingLevelChanges");
@@ -63,9 +62,8 @@ public void TestDatabaseDataMaskingTextRuleLifecycle()
6362
RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle");
6463
}
6564

66-
[Fact(Skip = "Test executes for long time period")]
65+
[Fact]
6766
[Trait(Category.RunType, Category.LiveOnly)]
68-
[Trait(Category.AcceptanceType, Category.CheckIn)]
6967
public void TestDatabaseDataMaskingRuleCreationFailures()
7068
{
7169
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.cs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,21 @@ public void TestDatabaseUpdatePolicyWithStorage()
2626
RunPowerShellTest("Test-DatabaseUpdatePolicyWithStorage");
2727
}
2828

29-
[Fact(Skip = "Test executes for long time period")]
29+
[Fact]
3030
[Trait(Category.RunType, Category.LiveOnly)]
31-
[Trait(Category.AcceptanceType, Category.CheckIn)]
3231
public void TestServerUpdatePolicyWithStorage()
3332
{
3433
RunPowerShellTest("Test-ServerUpdatePolicyWithStorage");
3534
}
3635

37-
[Fact(Skip = "Test executes for long time period")]
38-
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
[Fact]
3937
public void TestDatabaseUpdatePolicyWithEventTypes()
4038
{
4139
RunPowerShellTest("Test-DatabaseUpdatePolicyWithEventTypes");
4240
}
4341

44-
[Fact(Skip = "Skip for the version header upgrade on Storage library.")]
42+
[Fact]
4543
[Trait(Category.RunType, Category.LiveOnly)]
46-
[Trait(Category.AcceptanceType, Category.CheckIn)]
4744
public void TestServerUpdatePolicyWithEventTypes()
4845
{
4946
RunPowerShellTest("Test-ServerUpdatePolicyWithEventTypes");
@@ -184,33 +181,29 @@ public void TestServerStorageKeyRotation()
184181
RunPowerShellTest("Test-ServerStorageKeyRotation");
185182
}
186183

187-
[Fact(Skip = "Test executes for long time period")]
184+
[Fact]
188185
[Trait(Category.RunType, Category.LiveOnly)]
189-
[Trait(Category.AcceptanceType, Category.CheckIn)]
190186
public void TestServerUpdatePolicyWithRetention()
191187
{
192188
RunPowerShellTest("Test-ServerUpdatePolicyWithRetention");
193189
}
194190

195-
[Fact(Skip = "Test executes for long time period")]
191+
[Fact]
196192
[Trait(Category.RunType, Category.LiveOnly)]
197-
[Trait(Category.AcceptanceType, Category.CheckIn)]
198193
public void TestDatabaseUpdatePolicyWithRetention()
199194
{
200195
RunPowerShellTest("Test-DatabaseUpdatePolicyWithRetention");
201196
}
202197

203-
[Fact(Skip = "Test executes for long time period")]
198+
[Fact]
204199
[Trait(Category.RunType, Category.LiveOnly)]
205-
[Trait(Category.AcceptanceType, Category.CheckIn)]
206200
public void TestServerRetentionKeepProperties()
207201
{
208202
RunPowerShellTest("Test-ServerRetentionKeepProperties");
209203
}
210204

211-
[Fact(Skip = "Test executes for long time period")]
205+
[Fact]
212206
[Trait(Category.RunType, Category.LiveOnly)]
213-
[Trait(Category.AcceptanceType, Category.CheckIn)]
214207
public void TestDatabaseRetentionKeepProperties()
215208
{
216209
RunPowerShellTest("Test-DatabaseRetentionKeepProperties");

0 commit comments

Comments
 (0)