Skip to content

Commit 5124eeb

Browse files
azdevxpsazdevxps
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into addLC1
2 parents 321a7d7 + d224327 commit 5124eeb

File tree

9 files changed

+25
-24
lines changed

9 files changed

+25
-24
lines changed

‎src/ResourceManager/AnalysisServices/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+
* Remove validate set of location into dynamic lookup so that all clouds are supported.
2122

2223
## Version 0.5.0
2324
* Fixed Synchronize-AzureAsInstance command to work with new AsAzure REST API for sync

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands/NewAzureRmAnalysisServicesServer.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ public class NewAnalysisServicesServer : AnalysisServicesCmdletBase
4141
[Parameter(ValueFromPipelineByPropertyName = true, Position = 2, Mandatory = true,
4242
HelpMessage = "Azure region where the server should be created.")]
4343
[ValidateNotNullOrEmpty]
44-
[ValidateSet("North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US",
45-
"East US",
46-
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
47-
"Australia Southeast", IgnoreCase = true)]
44+
[LocationCompleter("Microsoft.AnalysisServices/servers")]
4845
public string Location { get; set; }
4946

5047
[Parameter(ValueFromPipelineByPropertyName = true, Position = 3, Mandatory = true,

‎src/ResourceManager/Network/Commands.Network/help/Set-AzureRmPublicIpAddress.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ Parameter 'PublicIpAddress' accepts value of type 'PSPublicIpAddress' from the p
108108
109109
[Get-AzureRmPublicIpAddress](./Get-AzureRmPublicIpAddress.md)
110110
111-
[Get-AzureRmPublicIpAddress](./Get-AzureRmPublicIpAddress.md)
112-
113111
[New-AzureRmPublicIpAddress](./New-AzureRmPublicIpAddress.md)
114112
115113
[Remove-AzureRmPublicIpAddress](./Remove-AzureRmPublicIpAddress.md)

‎src/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 8.6.0 and Azure Storage DataMovement Library 0.6.5
2122

2223
## Version 4.0.0
2324
* Upgrade to Azure Storage Client Library 8.5.0 and Azure Storage DataMovement Library 0.6.3

‎src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@
122122
<Reference Include="Microsoft.WindowsAzure.Management">
123123
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
124124
</Reference>
125-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\WindowsAzure.Storage.8.5.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
125+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126+
<HintPath>..\..\packages\WindowsAzure.Storage.8.6.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
127127
</Reference>
128-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129-
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.3\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
128+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.6.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129+
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.5\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
130130
</Reference>
131131
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
132132
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Storage.DataMovement" version="0.6.3" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Storage.DataMovement" version="0.6.5" targetFramework="net452" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
@@ -25,7 +25,7 @@
2525
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
2626
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
2727
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
28-
<package id="WindowsAzure.Storage" version="8.5.0" targetFramework="net452" />
28+
<package id="WindowsAzure.Storage" version="8.6.0" targetFramework="net452" />
2929
<package id="xunit" version="2.1.0" targetFramework="net45" />
3030
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
3131
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@
6060
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\WindowsAzure.Storage.8.5.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
63+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\WindowsAzure.Storage.8.6.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.3\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
66+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.6.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.5\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
6868
</Reference>
6969
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Storage.DataMovement" version="0.6.3" targetFramework="net452" />
4+
<package id="Microsoft.Azure.Storage.DataMovement" version="0.6.5" targetFramework="net452" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
77
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" />
@@ -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="8.5.0" targetFramework="net452" />
14+
<package id="WindowsAzure.Storage" version="8.6.0" targetFramework="net452" />
1515
</packages>

‎tools/AzureRM.Example.psm1

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ if ($PSVersionTable.PSVersion.Major -ge 5)
1616
$completerCommands = %COMPLETERCOMMANDS%
1717

1818
$completerCommands | ForEach-Object {
19-
$completerObject = New-Object $_.AttributeType -ArgumentList $_.ArgumentList
20-
Register-ArgumentCompleter -CommandName $_.Command -ParameterName $_.Parameter -ScriptBlock {
21-
param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameter)
22-
23-
$locations = $completerObject.GetCompleterValues()
24-
$locations | Where-Object { $_ -Like "$wordToComplete*" } | ForEach-Object { [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_) }
19+
$type = $_.AttributeType
20+
$args = "@()"
21+
if ($_.ArgumentList.Count -ne 0) {
22+
$temp = $_.ArgumentList -join "`", `""
23+
$args = "@(`"" + $temp + "`")"
2524
}
25+
$sb = [scriptblock]::Create("param(`$commandName, `$parameterName, `$wordToComplete, `$commandAst, `$fakeBoundParameter) `
26+
`$completerObject = New-Object $type -ArgumentList $args `
27+
`$arguments = `$completerObject.GetCompleterValues() `
28+
`$arguments | Where-Object { `$_ -Like `"`$wordToComplete*`" } | ForEach-Object { [System.Management.Automation.CompletionResult]::new(`$_, `$_, 'ParameterValue', `$_) }")
29+
Register-ArgumentCompleter -CommandName $_.Command -ParameterName $_.Parameter -ScriptBlock $sb
2630
}
2731
}
2832

0 commit comments

Comments
 (0)