Skip to content

Commit 0573a57

Browse files
emgu-msemgu-ms
committed
Pull + merge
2 parents 82df624 + 9343403 commit 0573a57

24 files changed

+6425
-91
lines changed

‎src/Relay/Relay/Cmdlets/HybridConnections/GetAzureRelayHybridConnections.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Relay.Commands.HybridConnections
2525
/// <para> If HybridConnections name provided, a single HybridConnections detials will be returned</para>
2626
/// <para> If WcfRelayHybridConnections name not provided, list of WcfRelayHybridConnections will be returned</para>
2727
/// </summary>
28-
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection"), OutputType(typeof(PSHybridConnectionAttibutes))]
28+
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection"), OutputType(typeof(PSHybridConnectionAttributes))]
2929
public class GetAzureRmRelayHybridConnection : AzureRelayCmdletBase
3030
{
3131
[Parameter(Mandatory = true,
@@ -54,13 +54,13 @@ public override void ExecuteCmdlet()
5454
if (!string.IsNullOrEmpty(Name))
5555
{
5656
// Get a HybridConnections
57-
PSHybridConnectionAttibutes hybridConnections = Client.GetHybridConnections(ResourceGroupName, Namespace, Name);
57+
PSHybridConnectionAttributes hybridConnections = Client.GetHybridConnections(ResourceGroupName, Namespace, Name);
5858
WriteObject(hybridConnections);
5959
}
6060
else
6161
{
6262
// Get all HybridConnections
63-
IEnumerable<PSHybridConnectionAttibutes> hybridConnectionsList = Client.ListAllHybridConnections(ResourceGroupName, Namespace);
63+
IEnumerable<PSHybridConnectionAttributes> hybridConnectionsList = Client.ListAllHybridConnections(ResourceGroupName, Namespace);
6464
WriteObject(hybridConnectionsList.ToList(), true);
6565
}
6666
}

‎src/Relay/Relay/Cmdlets/HybridConnections/NewAzureRelayHybridConnections.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Relay.Commands.HybridConnection
2222
/// <summary>
2323
/// 'New-AzRelayHybridConnection' Cmdlet creates a new HybridConnections
2424
/// </summary>
25-
[Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection", SupportsShouldProcess = true), OutputType(typeof(PSHybridConnectionAttibutes))]
25+
[Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection", SupportsShouldProcess = true), OutputType(typeof(PSHybridConnectionAttributes))]
2626
public class NewAzureRmRelayHybridConnection : AzureRelayCmdletBase
2727
{
2828
[Parameter(Mandatory = true,
@@ -52,7 +52,7 @@ public class NewAzureRmRelayHybridConnection : AzureRelayCmdletBase
5252
ParameterSetName = HybridConnectionInputObjectParameterSet,
5353
HelpMessage = "HybridConnections object.")]
5454
[ValidateNotNullOrEmpty]
55-
public PSHybridConnectionAttibutes InputObject { get; set; }
55+
public PSHybridConnectionAttributes InputObject { get; set; }
5656

5757
[Parameter(Mandatory = false,
5858
ValueFromPipelineByPropertyName = true,
@@ -70,7 +70,7 @@ public class NewAzureRmRelayHybridConnection : AzureRelayCmdletBase
7070

7171
public override void ExecuteCmdlet()
7272
{
73-
PSHybridConnectionAttibutes hybridConnections = new PSHybridConnectionAttibutes();
73+
PSHybridConnectionAttributes hybridConnections = new PSHybridConnectionAttributes();
7474

7575
if (InputObject != null)
7676
{

‎src/Relay/Relay/Cmdlets/HybridConnections/SetAzureRelayHybridConnections.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Relay.Commands.HybridConnections
2121
/// <summary>
2222
/// 'Set-AzRelayHybridConnection' Cmdlet updates the specified WcfRelay
2323
/// </summary>
24-
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection", SupportsShouldProcess = true), OutputType(typeof(PSHybridConnectionAttibutes))]
24+
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RelayHybridConnection", SupportsShouldProcess = true), OutputType(typeof(PSHybridConnectionAttributes))]
2525
public class SetAzureRelayHybridConnections : AzureRelayCmdletBase
2626
{
2727
[Parameter(Mandatory = true,
@@ -51,7 +51,7 @@ public class SetAzureRelayHybridConnections : AzureRelayCmdletBase
5151
ValueFromPipeline = true,
5252
HelpMessage = "HybridConnections object.")]
5353
[ValidateNotNullOrEmpty]
54-
public PSHybridConnectionAttibutes InputObject { get; set; }
54+
public PSHybridConnectionAttributes InputObject { get; set; }
5555

5656
[Parameter(Mandatory = false,
5757
ValueFromPipelineByPropertyName = true,
@@ -62,7 +62,7 @@ public class SetAzureRelayHybridConnections : AzureRelayCmdletBase
6262

6363
public override void ExecuteCmdlet()
6464
{
65-
PSHybridConnectionAttibutes hybridConnections = new PSHybridConnectionAttibutes();
65+
PSHybridConnectionAttributes hybridConnections = new PSHybridConnectionAttributes();
6666

6767
if (InputObject != null)
6868
{

‎src/Relay/Relay/Models/PSHybridConnectionAttibutes.cs renamed to ‎src/Relay/Relay/Models/PSHybridConnectionAttributes.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ namespace Microsoft.Azure.Commands.Relay.Models
1313
/// <summary>
1414
/// Description of HybridConnection Resource.
1515
/// </summary>
16-
public partial class PSHybridConnectionAttibutes : PSResourceAttributes
16+
public partial class PSHybridConnectionAttributes : PSResourceAttributes
1717
{
1818
/// <summary>
1919
/// Initializes a new instance of the HybridConnection class.
2020
/// </summary>
21-
public PSHybridConnectionAttibutes() { }
21+
public PSHybridConnectionAttributes() { }
2222

2323
/// <summary>
2424
/// Initializes a new instance of the HybridConnection class.
@@ -39,7 +39,7 @@ public PSHybridConnectionAttibutes() { }
3939
/// can be used to store descriptive data, such as list of teams and
4040
/// their contact information also user-defined configuration settings
4141
/// can be stored.</param>
42-
public PSHybridConnectionAttibutes(string id = default(string), string name = default(string), string type = default(string), System.DateTime? createdAt = default(System.DateTime?), System.DateTime? updatedAt = default(System.DateTime?), int? listenerCount = default(int?), bool? requiresClientAuthorization = default(bool?), string userMetadata = default(string))
42+
public PSHybridConnectionAttributes(string id = default(string), string name = default(string), string type = default(string), System.DateTime? createdAt = default(System.DateTime?), System.DateTime? updatedAt = default(System.DateTime?), int? listenerCount = default(int?), bool? requiresClientAuthorization = default(bool?), string userMetadata = default(string))
4343
: base(id, name, type)
4444
{
4545
CreatedAt = createdAt;
@@ -50,7 +50,7 @@ public PSHybridConnectionAttibutes() { }
5050
}
5151

5252

53-
public PSHybridConnectionAttibutes(HybridConnection hybridConnection)
53+
public PSHybridConnectionAttributes(HybridConnection hybridConnection)
5454
{
5555
Id = hybridConnection.Id;
5656
Name = hybridConnection.Name;

‎src/Relay/Relay/Utilities/RelayClient.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,20 +272,20 @@ public PSAuthorizationRuleKeysAttributes WcfRelayRegenerateKeys(string resourceG
272272
#endregion
273273

274274
#region HybridConnections
275-
public PSHybridConnectionAttibutes GetHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName)
275+
public PSHybridConnectionAttributes GetHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName)
276276
{
277277
var response = Client.HybridConnections.Get(resourceGroupName, namespaceName, hybridConnectionsName);
278-
return new PSHybridConnectionAttibutes(response);
278+
return new PSHybridConnectionAttributes(response);
279279
}
280280

281-
public IEnumerable<PSHybridConnectionAttibutes> ListAllHybridConnections(string resourceGroupName, string namespaceName)
281+
public IEnumerable<PSHybridConnectionAttributes> ListAllHybridConnections(string resourceGroupName, string namespaceName)
282282
{
283283
var response = Client.HybridConnections.ListByNamespace(resourceGroupName, namespaceName);
284-
var resourceList = response.Select(resource => new PSHybridConnectionAttibutes(resource));
284+
var resourceList = response.Select(resource => new PSHybridConnectionAttributes(resource));
285285
return resourceList;
286286
}
287287

288-
public PSHybridConnectionAttibutes CreateOrUpdateHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName, PSHybridConnectionAttibutes parameter)
288+
public PSHybridConnectionAttributes CreateOrUpdateHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName, PSHybridConnectionAttributes parameter)
289289
{
290290
var Parameter1 = new HybridConnection();
291291

@@ -298,18 +298,18 @@ public PSHybridConnectionAttibutes CreateOrUpdateHybridConnections(string resour
298298
Parameter1.UserMetadata = parameter.UserMetadata;
299299

300300
var response = Client.HybridConnections.CreateOrUpdate(resourceGroupName, namespaceName, hybridConnectionsName, Parameter1);
301-
return new PSHybridConnectionAttibutes(response);
301+
return new PSHybridConnectionAttributes(response);
302302
}
303303

304-
public PSHybridConnectionAttibutes UpdateHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName, PSHybridConnectionAttibutes parameter)
304+
public PSHybridConnectionAttributes UpdateHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName, PSHybridConnectionAttributes parameter)
305305
{
306306
//var Parameter1 = Client.HybridConnections.Get(resourceGroupName, namespaceName, hybridConnectionsName);
307307
var Parameter1 = new HybridConnection();
308308
if (!string.IsNullOrEmpty(parameter.UserMetadata))
309309
Parameter1.UserMetadata = parameter.UserMetadata;
310310

311311
var response = Client.HybridConnections.CreateOrUpdate(resourceGroupName, namespaceName, hybridConnectionsName, Parameter1);
312-
return new PSHybridConnectionAttibutes(response);
312+
return new PSHybridConnectionAttributes(response);
313313
}
314314

315315
public void DeleteHybridConnections(string resourceGroupName, string namespaceName, string hybridConnectionsName)

‎src/Relay/Relay/help/Get-AzRelayHybridConnection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
110110
111111
## OUTPUTS
112112
113-
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
113+
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
114114
115115
## NOTES
116116

‎src/Relay/Relay/help/New-AzRelayHybridConnection.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Creates a HybridConnection in the specified Relay namespace.
1515
### HybridConnectionInputObjectSet
1616
```
1717
New-AzRelayHybridConnection [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String>
18-
[-InputObject <PSHybridConnectionAttibutes>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
18+
[-InputObject <PSHybridConnectionAttributes>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
1919
[<CommonParameters>]
2020
```
2121

@@ -91,7 +91,7 @@ Accept wildcard characters: False
9191
HybridConnections object.
9292
9393
```yaml
94-
Type: Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
94+
Type: Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
9595
Parameter Sets: HybridConnectionInputObjectSet
9696
Aliases:
9797

@@ -216,13 +216,13 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
216216
217217
### System.String
218218
219-
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
219+
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
220220
221221
### System.Nullable`1[[System.Boolean, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]
222222

223223
## OUTPUTS
224224

225-
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
225+
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
226226

227227
## NOTES
228228

‎src/Relay/Relay/help/Set-AzRelayHybridConnection.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Updates the description of a HybridConnection in the specified Relay namespace.
1515
### HybridConnectionInputObjectSet
1616
```
1717
Set-AzRelayHybridConnection [-ResourceGroupName] <String> [-Namespace] <String> [-Name] <String>
18-
[-InputObject <PSHybridConnectionAttibutes>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
18+
[-InputObject <PSHybridConnectionAttributes>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
1919
[<CommonParameters>]
2020
```
2121

@@ -89,7 +89,7 @@ Accept wildcard characters: False
8989
HybridConnections object.
9090
9191
```yaml
92-
Type: Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
92+
Type: Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
9393
Parameter Sets: HybridConnectionInputObjectSet
9494
Aliases:
9595

@@ -199,11 +199,11 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
199199
200200
### System.String
201201
202-
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
202+
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
203203
204204
## OUTPUTS
205205
206-
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttibutes
206+
### Microsoft.Azure.Commands.Relay.Models.PSHybridConnectionAttributes
207207
208208
## NOTES
209209

‎src/Security/Security/Az.Security.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.7.4'
15+
ModuleVersion = '0.7.5'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'

‎src/Security/Security/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,5 @@
4545
//
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
48-
// [assembly: AssemblyVersion("0.7.1")]
49-
[assembly: AssemblyVersion("0.7.4")]
50-
[assembly: AssemblyFileVersion("0.7.4")]
48+
[assembly: AssemblyVersion("0.7.5")]
49+
[assembly: AssemblyFileVersion("0.7.5")]

‎src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public void TestListDatabaseRestorePoints()
3434
// TODO https://github.com/Azure/azure-powershell/issues/4155
3535
RunPowerShellTest("Test-ListDatabaseRestorePoints");
3636
}
37+
3738
[Fact]
3839
[Trait(Category.AcceptanceType, Category.CheckIn)]
3940
public void TestRestoreGeoBackup()
@@ -45,6 +46,7 @@ public void TestRestoreGeoBackup()
4546
RunPowerShellTest("Test-RestoreGeoBackup");
4647
}
4748
}
49+
4850
[Fact]
4951
[Trait(Category.AcceptanceType, Category.CheckIn)]
5052
public void TestRestoreDeletedDatabaseBackup()
@@ -56,6 +58,7 @@ public void TestRestoreDeletedDatabaseBackup()
5658
RunPowerShellTest("Test-RestoreDeletedDatabaseBackup");
5759
}
5860
}
61+
5962
[Fact]
6063
[Trait(Category.AcceptanceType, Category.CheckIn)]
6164
public void TestRestorePointInTimeBackup()
@@ -79,18 +82,28 @@ public void TestRestoreLongTermRetentionBackup()
7982
RunPowerShellTest("Test-RestoreLongTermRetentionBackup");
8083
}
8184
}
85+
8286
[Fact]
8387
[Trait(Category.AcceptanceType, Category.CheckIn)]
8488
public void TestLongTermRetentionV2Policy()
8589
{
8690
RunPowerShellTest("Test-LongTermRetentionV2Policy");
8791
}
92+
8893
[Fact]
8994
[Trait(Category.AcceptanceType, Category.CheckIn)]
9095
public void TestLongTermRetentionV2Backup()
9196
{
9297
RunPowerShellTest("Test-LongTermRetentionV2Backup");
9398
}
99+
100+
[Fact]
101+
[Trait(Category.AcceptanceType, Category.CheckIn)]
102+
public void TestLongTermRetentionV2ResourceGroupBasedBackup()
103+
{
104+
RunPowerShellTest("Test-LongTermRetentionV2ResourceGroupBasedBackup");
105+
}
106+
94107
[Fact(Skip = "This is not recordable test")]
95108
[Trait(Category.AcceptanceType, Category.CheckIn)]
96109
public void TestLongTermRetentionV2()
@@ -102,6 +115,14 @@ public void TestLongTermRetentionV2()
102115
RunPowerShellTest("Test-LongTermRetentionV2");
103116
}
104117
}
118+
119+
[Fact]
120+
[Trait(Category.AcceptanceType, Category.CheckIn)]
121+
public void TestLongTermRetentionV2ResourceGroupBased()
122+
{
123+
RunPowerShellTest("Test-LongTermRetentionV2ResourceGroupBased");
124+
}
125+
105126
[Fact]
106127
[Trait(Category.AcceptanceType, Category.CheckIn)]
107128
public void TestDatabaseGeoBackupPolicy()
@@ -113,6 +134,7 @@ public void TestDatabaseGeoBackupPolicy()
113134
RunPowerShellTest("Test-DatabaseGeoBackupPolicy");
114135
}
115136
}
137+
116138
[Fact]
117139
[Trait(Category.AcceptanceType, Category.CheckIn)]
118140
public void TestNewDatabaseRestorePoint()
@@ -124,6 +146,7 @@ public void TestNewDatabaseRestorePoint()
124146
RunPowerShellTest("Test-NewDatabaseRestorePoint");
125147
}
126148
}
149+
127150
[Fact]
128151
[Trait(Category.AcceptanceType, Category.CheckIn)]
129152
public void TestRemoveDatabaseRestorePoint()

0 commit comments

Comments
 (0)