Skip to content

Commit 928c2e7

Browse files
bganapabganapa
authored
Merge branch 'preview' into network-2018
2 parents d098039 + 2e3d149 commit 928c2e7

File tree

315 files changed

+7609
-3477
lines changed

Some content is hidden

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

315 files changed

+7609
-3477
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<ItemGroup>
3131
<PackageReference Include="AutoMapper" Version="6.2.2" />
3232
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
33-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
33+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Azure.Batch" Version="8.1.1" />
2828
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
2929
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
30-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
30+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Azure.Batch" Version="8.1.1" />
3232
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
3333
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.0" />
34-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
34+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
3333
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3434
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
35-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
35+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎src/ResourceManager/Profile/Commands.Profile/packages.config

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.94-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
19-
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.94-preview" targetFramework="net452" />
20-
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.94-preview" targetFramework="net452" />
21-
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.94-preview" targetFramework="net452" />
22-
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.94-preview" targetFramework="net452" />
23-
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
24-
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
25-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
26-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
27-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
28-
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.94-preview" targetFramework="net452" />
29-
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.94-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.96-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
19+
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.96-preview" targetFramework="net452" />
20+
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.96-preview" targetFramework="net452" />
21+
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.96-preview" targetFramework="net452" />
22+
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.96-preview" targetFramework="net452" />
23+
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
24+
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
25+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
26+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
27+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
28+
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.96-preview" targetFramework="net452" />
29+
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.96-preview" targetFramework="net452" />
3030
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
3131
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
3232
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />

‎src/ResourceManager/Sql/Commands.Sql/help/Remove-AzureRmSqlServerAuditing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Server identifiers include the **ResourceGroupName** and **ServerName**.
2929

3030
### Example 1: Remove the auditing of an Azure SQL server
3131
```
32-
PS C:\>Remove-AzureRmSqlDatabaseAuditing -ResourceGroupName "ResourceGroup01" -ServerName "Server01"
32+
PS C:\>Remove-AzureRmSqlServerAuditing -ResourceGroupName "ResourceGroup01" -ServerName "Server01"
3333
```
3434

3535
This command removes the auditing of all the databases located on Server01 in resource group.

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
24-
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
24+
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
2525
<package id="xunit" version="2.1.0" targetFramework="net45" />
2626
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
2727
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

‎src/ResourceManager/Storage/Commands.Management.Storage/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Upgrade to Azure Storage Client Library 9.3.0
2122

2223
## Version 5.0.4
2324
* Fixed issue with default resource groups not being set.

‎src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
37-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
37+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.0.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
69-
<Private>True</Private>
67+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.3.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
7069
</Reference>
7170
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7271
<HintPath>..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>

‎src/ResourceManager/Storage/Commands.Management.Storage/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" />
1212
<package id="System.Net.Requests" version="4.0.11" targetFramework="net452" />
1313
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
14-
<package id="WindowsAzure.Storage" version="9.0.0" targetFramework="net452" />
14+
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
1515
</packages>

‎src/ServiceManagement/Services/Commands.Utilities/packages.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
12-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.94-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.96-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
1919
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
2020
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
2121
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/StackAdmin/Azs.Backup.Admin/Help/Azs.Backup.Admin.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ Locale: en-US
88

99
# Azs.Backup.Admin Module
1010
## Description
11-
Preview release of the Backup administrator module that allows administrators to
12-
- Configure where backups are stored
13-
- Perform backups
14-
- List and restore completed backup
11+
{{Manually Enter Description Here}}
1512

1613
## Azs.Backup.Admin Cmdlets
1714
### [Get-AzsBackup](Get-AzsBackup.md)
1815
Returns a backup from a location based on name.
1916

20-
### [Get-AzsBackupLocation](Get-AzsBackupLocation.md)
21-
Returns the list of backup locations.
17+
### [Get-AzsBackupConfiguration](Get-AzsBackupConfiguration.md)
18+
Returns the list of backup configurations.
19+
20+
### [New-AzsEncryptionKeyBase64](New-AzsEncryptionKeyBase64.md)
21+
Generate encryption key for infrastructure backups.
2222

2323
### [Restore-AzsBackup](Restore-AzsBackup.md)
2424
Restore a backup.
2525

26-
### [Set-AzsBackupShare](Set-AzsBackupShare.md)
27-
Create a new backup location.
26+
### [Set-AzsBackupConfiguration](Set-AzsBackupConfiguration.md)
27+
Set the backup configuration at the specified location.
2828

2929
### [Start-AzsBackup](Start-AzsBackup.md)
3030
Back up a specific location.

‎src/StackAdmin/Azs.Backup.Admin/Help/Get-AzsBackup.md

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Azs.Backup.Admin-help.xml
33
Module Name: Azs.Backup.Admin
4-
online version:
4+
online version:
55
schema: 2.0.0
66
---
77

@@ -38,14 +38,14 @@ Returns a backup from a location based on name.
3838

3939
## EXAMPLES
4040

41-
### EXAMPLE 1
41+
### -------------------------- EXAMPLE 1 --------------------------
4242
```
4343
Get-AzsBackup
4444
```
4545

4646
Get information sbout all Azure Stack backups.
4747

48-
### EXAMPLE 2
48+
### -------------------------- EXAMPLE 2 --------------------------
4949
```
5050
Get-AzsBackup -Name 'backupName'
5151
```
@@ -54,48 +54,48 @@ Get information for the the specified Azure Stack backup.
5454

5555
## PARAMETERS
5656

57-
### -Name
58-
Name of the backup.
57+
### -Location
58+
Location backed up.
5959

6060
```yaml
6161
Type: String
62-
Parameter Sets: Get
63-
Aliases:
62+
Parameter Sets: List, Get
63+
Aliases:
6464

65-
Required: True
65+
Required: False
6666
Position: Named
6767
Default value: None
6868
Accept pipeline input: False
6969
Accept wildcard characters: False
7070
```
7171
72-
### -Location
73-
Location backed up.
72+
### -Name
73+
Name of the backup.
7474
7575
```yaml
7676
Type: String
77-
Parameter Sets: List, Get
78-
Aliases:
77+
Parameter Sets: Get
78+
Aliases:
7979

80-
Required: False
80+
Required: True
8181
Position: Named
8282
Default value: None
8383
Accept pipeline input: False
8484
Accept wildcard characters: False
8585
```
8686
87-
### -ResourceId
88-
The resource id.
87+
### -ParentResource
88+
Passing a backup location will return the list of all backups at that backup location.
8989
9090
```yaml
91-
Type: String
92-
Parameter Sets: ResourceId
93-
Aliases: id
91+
Type: BackupLocation
92+
Parameter Sets: ParentResource
93+
Aliases:
9494

9595
Required: True
9696
Position: Named
9797
Default value: None
98-
Accept pipeline input: True (ByPropertyName)
98+
Accept pipeline input: True (ByValue)
9999
Accept wildcard characters: False
100100
```
101101
@@ -105,7 +105,7 @@ Name of the resource group.
105105
```yaml
106106
Type: String
107107
Parameter Sets: List, Get
108-
Aliases:
108+
Aliases:
109109

110110
Required: False
111111
Position: Named
@@ -114,30 +114,28 @@ Accept pipeline input: False
114114
Accept wildcard characters: False
115115
```
116116
117-
### -ParentResource
118-
Passing a backup location will return the list of all backups at that backup location.
117+
### -ResourceId
118+
The resource id.
119119
120120
```yaml
121-
Type: BackupLocation
122-
Parameter Sets: ParentResource
123-
Aliases:
121+
Type: String
122+
Parameter Sets: ResourceId
123+
Aliases: id
124124

125125
Required: True
126126
Position: Named
127127
Default value: None
128-
Accept pipeline input: True (ByValue)
128+
Accept pipeline input: True (ByPropertyName)
129129
Accept wildcard characters: False
130130
```
131131
132-
### -Top
133-
Return the top N items as specified by the parameter value.
134-
Applies after the -Skip parameter.
135-
132+
### -Skip
133+
{{Fill Skip Description}}
136134
137135
```yaml
138136
Type: Int32
139137
Parameter Sets: List, ParentResource
140-
Aliases:
138+
Aliases:
141139

142140
Required: False
143141
Position: Named
@@ -146,13 +144,13 @@ Accept pipeline input: False
146144
Accept wildcard characters: False
147145
```
148146
149-
### -Skip
150-
Skip the first N items as specified by the parameter value.
147+
### -Top
148+
{{Fill Top Description}}
151149
152150
```yaml
153151
Type: Int32
154152
Parameter Sets: List, ParentResource
155-
Aliases:
153+
Aliases:
156154

157155
Required: False
158156
Position: Named
@@ -173,3 +171,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
173171
## NOTES
174172
175173
## RELATED LINKS
174+

0 commit comments

Comments
 (0)