Azure
/
azure-powershell-1
зеркало из https://github.com/Azure/azure-powershell-1.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[PowerShell] 3 P1 bug fix

This commit is contained in:
Jerry (Zhenyu) Dai 2014-11-21 15:25:20 +08:00
Родитель 1f40993063
Коммит 1ff444e411
4 изменённых файлов: 41 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
Просмотреть файл

@ -13,6 +13,7 @@
// ----------------------------------------------------------------------------------
using System;
using System.Globalization;
using System.Management.Automation;
using System.Security.Permissions;
using Microsoft.WindowsAzure.Commands.Common;
@ -346,7 +347,14 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Common.Cmdlet
}
else
{
azureEnvironment = DefaultProfileClient.GetEnvironmentOrDefault(azureEnvironmentName);
try
{
azureEnvironment = DefaultProfileClient.GetEnvironmentOrDefault(azureEnvironmentName);
}
catch (ArgumentException e)
{
throw new ArgumentException(e.Message + String.Format(CultureInfo.CurrentCulture, Resources.ValidEnvironmentName, EnvironmentName.AzureCloud, EnvironmentName.AzureChinaCloud));
}
}
Uri blobEndPoint = azureEnvironment.GetStorageBlobEndpoint(storageAccountName, useHttps);

30
src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml
Просмотреть файл

@ -2643,7 +2643,7 @@ echo &quot;Total $total containers&quot;</dev:code>
<maml:introduction>
<maml:para></maml:para>
</maml:introduction>
<dev:code>PS C:\&gt; Get-AzureStorageFileContent -FileShareName sample -FilePath sampledir/samplefile</dev:code>
<dev:code>PS C:\&gt; Get-AzureStorageFileContent -ShareName sample -FilePath sampledir/samplefile</dev:code>
<dev:remarks>
<maml:para>This example downloads the file whose path is sampledir/samplefile in the sample file share.</maml:para>
</dev:remarks>
@ -3039,6 +3039,9 @@ echo &quot;Total $total containers&quot;</dev:code>
</command:example>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:uri>http://msdn.microsoft.com/en-us/library/azure/gg433048.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@ -3209,6 +3212,9 @@ echo &quot;Total $total containers&quot;</dev:code>
</command:example>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:uri>http://msdn.microsoft.com/en-us/library/azure/hh343258.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@ -4125,8 +4131,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
<maml:uri></maml:uri>
<maml:uri>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
@ -4649,8 +4654,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
<maml:uri></maml:uri>
<maml:uri>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
@ -4956,7 +4960,7 @@ New-AzureStorageBlobSASToken -Container cname -Blob bname -Permission rwd -Start
<maml:name>String</maml:name>
<maml:uri/>
</dev:type>
<dev:defaultValue></dev:defaultValue>
<dev:defaultValue>AzureCloud | AzureChinaCloud</dev:defaultValue>
</command:parameter>
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>ConnectionString</maml:name>
@ -6041,8 +6045,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
<maml:uri></maml:uri>
<maml:uri>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
@ -6893,8 +6896,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:linkText>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:linkText>
<maml:uri></maml:uri>
<maml:uri>http://msdn.microsoft.com/en-us/library/windowsazure/dn140255.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
@ -9482,7 +9484,7 @@ $context | Get-AzureStorageBlob -Container abc</dev:code>
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue, ByPropertyName)" position="0">
<maml:name>Name</maml:name>
<maml:description>
<maml:para></maml:para>
<maml:para>The name of the table to be removed.</maml:para>
</maml:description>
<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
</command:parameter>
@ -11368,6 +11370,9 @@ Set-AzureStorageBlobContent -File filename -Container containername -Metadata $m
</command:example>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:uri>http://msdn.microsoft.com/en-us/library/azure/gg433048.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
@ -11614,6 +11619,9 @@ Set-AzureStorageBlobContent -File filename -Container containername -Metadata $m
</command:example>
</command:examples>
<maml:relatedLinks>
<maml:navigationLink>
<maml:uri>http://msdn.microsoft.com/en-us/library/azure/hh343258.aspx</maml:uri>
</maml:navigationLink>
</maml:relatedLinks>
</command:command>
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">

9
src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -1459,6 +1459,15 @@ namespace Microsoft.WindowsAzure.Commands.Storage {
}
}
/// <summary>
/// Looks up a localized string similar to Valid environment names are: &apos;{0}&apos; and &apos;{1}&apos;.
/// </summary>
internal static string ValidEnvironmentName {
get {
return ResourceManager.GetString("ValidEnvironmentName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} {1}..
/// </summary>

4
src/ServiceManagement/Storage/Commands.Storage/Resources.resx
Просмотреть файл

@ -661,4 +661,8 @@ Failed: {2}.</value>
<data name="TransmitCancelled" xml:space="preserve">
<value>Transmit cancelled by user.</value>
</data>
<data name="ValidEnvironmentName" xml:space="preserve">
<value>Valid environment names are: '{0}' and '{1}'</value>
<comment>0 and 1 are for the correct Environment names</comment>
</data>
</root>