Skip to content

Commit 85f0d14

Browse files
yadavbdevyadavbdev
committed
Merge branch 'release-0.8.16' of https://github.com/Azure/azure-powershell into dev
2 parents 56297c3 + 7e05149 commit 85f0d14

File tree

69 files changed

+8876
-5654
lines changed

Some content is hidden

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

69 files changed

+8876
-5654
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,52 +2253,6 @@
22532253
</Component>
22542254
</Directory>
22552255
</Directory>
2256-
<Directory Id="dirE5EA14CE73A6C72D22D108D9497DF74C" Name="Python">
2257-
<Directory Id="dirCDAC5B8A642AC456869167EAE2A10C93" Name="WebRole">
2258-
<Component Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" Guid="*">
2259-
<File Id="filE6C0D9B69028476CEF9107E1347CA861" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\AzureSetup.cfg" />
2260-
</Component>
2261-
<Component Id="cmp5D8936EABB5A2DB970A0AB381C73830D" Guid="*">
2262-
<File Id="filE2A6F752B86D2DFA0959B90BD41DA77C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.config" />
2263-
</Component>
2264-
<Component Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" Guid="*">
2265-
<File Id="fil22FCD09649F038F981DDB84F67167316" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.content" />
2266-
</Component>
2267-
<Component Id="cmp021B29446C062B1149132B85E2459720" Guid="*">
2268-
<File Id="filF3D8A3E762DD13F9FFD7B2B0BB339070" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.WebRole.dll.content" />
2269-
</Component>
2270-
<Component Id="cmpA69B6C11506C243CDE56D867B794AC9F" Guid="*">
2271-
<File Id="fil848958AA95168855F8FE3E93358C2B76" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.Deployment.dll.content" />
2272-
</Component>
2273-
<Component Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" Guid="*">
2274-
<File Id="filD732F0BF33579E271040FE1DE0AB979E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.dll.content" />
2275-
</Component>
2276-
<Component Id="cmp0F225B9A1229479E467639080599E9D1" Guid="*">
2277-
<File Id="fil92F43807E9714346A87AFB7D901AE389" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.UI.dll.content" />
2278-
</Component>
2279-
<Component Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" Guid="*">
2280-
<File Id="fil7615C0F35ED9D985DD0C6EADB7E910CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\RoleSettings.xml" />
2281-
</Component>
2282-
<Component Id="cmpC252A869692E36346E5A3771DD27D205" Guid="*">
2283-
<File Id="fil7846CF7AD904A172B671C85CDF5CC0E6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Scaffold.xml" />
2284-
</Component>
2285-
<Component Id="cmp9F463ADD333B57253F89EE9E82167637" Guid="*">
2286-
<File Id="filB84BA051D600909C743652ECF66D8B51" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\web.cloud.config" />
2287-
</Component>
2288-
<Component Id="cmp43BD3F229DAE64FEDBC8155FEF158956" Guid="*">
2289-
<File Id="fil30EB96553E136D5AAA0C61DD1A9776F7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Web.config" />
2290-
</Component>
2291-
<Component Id="cmpA02D6608F19F40B64C14E402AD8E622B" Guid="*">
2292-
<File Id="filF4535711345CAACEFE8F95EB9C91C691" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebPICmdLine.exe.content" />
2293-
</Component>
2294-
<Component Id="cmp878544C3BBE474849E893E400314D586" Guid="*">
2295-
<File Id="fil56D79CA1DCB21C2716FF96E6BB48B5CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebRole.xml" />
2296-
</Component>
2297-
<Component Id="cmp70473B6477B7086BBB4B792180BF8925" Guid="*">
2298-
<File Id="fil3CB79929DB0097DEE79F047B38A9C19A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\wfastcgi.py" />
2299-
</Component>
2300-
</Directory>
2301-
</Directory>
23022256
</Directory>
23032257
</Directory>
23042258
</Directory>
@@ -3486,20 +3440,6 @@
34863440
<ComponentRef Id="cmp080181B4207E414501C622783B794CA8" />
34873441
<ComponentRef Id="cmpE4F565792794EACEBFA721815AE3957C" />
34883442
<ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
3489-
<ComponentRef Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" />
3490-
<ComponentRef Id="cmp5D8936EABB5A2DB970A0AB381C73830D" />
3491-
<ComponentRef Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" />
3492-
<ComponentRef Id="cmp021B29446C062B1149132B85E2459720" />
3493-
<ComponentRef Id="cmpA69B6C11506C243CDE56D867B794AC9F" />
3494-
<ComponentRef Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" />
3495-
<ComponentRef Id="cmp0F225B9A1229479E467639080599E9D1" />
3496-
<ComponentRef Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" />
3497-
<ComponentRef Id="cmpC252A869692E36346E5A3771DD27D205" />
3498-
<ComponentRef Id="cmp9F463ADD333B57253F89EE9E82167637" />
3499-
<ComponentRef Id="cmp43BD3F229DAE64FEDBC8155FEF158956" />
3500-
<ComponentRef Id="cmpA02D6608F19F40B64C14E402AD8E622B" />
3501-
<ComponentRef Id="cmp878544C3BBE474849E893E400314D586" />
3502-
<ComponentRef Id="cmp70473B6477B7086BBB4B792180BF8925" />
35033443
<ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
35043444
<ComponentRef Id="cmp65991ADC169007028A31A4F049E069EF" />
35053445
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />

‎src/Common/Commands.Common/Properties/Resources.Designer.cs

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/Commands.Common/Properties/Resources.resx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@
156156
<data name="AddRoleMessageCreatePHP" xml:space="preserve">
157157
<value>Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for PHP by running "pear WindowsAzure/WindowsAzure".</value>
158158
</data>
159-
<data name="AddRoleMessageCreatePython" xml:space="preserve">
160-
<value>Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Python by running "pip windowsazure".</value>
161-
</data>
162159
<data name="AddRoleMessageInsufficientPermissions" xml:space="preserve">
163160
<value>Unable to set role permissions. Please give the 'Network Service' user 'Read &amp; execute' and 'Modify' permissions to the role folder, or run PowerShell as an Administrator</value>
164161
</data>
@@ -576,9 +573,6 @@ Please follow these steps in the portal:
576573
<data name="ManifestUri" xml:space="preserve">
577574
<value>http://az413943.vo.msecnd.net/node/runtimemanifest_0.7.5.2.xml</value>
578575
</data>
579-
<data name="MissingPythonPreReq" xml:space="preserve">
580-
<value>Python 2.7 is not installed. Please install it as well as Django 1.4.</value>
581-
</data>
582576
<data name="MultipleAddOnsFoundMessage" xml:space="preserve">
583577
<value>Multiple Add-Ons found holding name {0}</value>
584578
</data>
@@ -830,9 +824,6 @@ Please follow these steps in the portal:
830824
<data name="PublishVerifyingStorageMessage" xml:space="preserve">
831825
<value>Verifying storage account '{0}'...</value>
832826
</data>
833-
<data name="PythonScaffolding" xml:space="preserve">
834-
<value>Resources\Scaffolding\Python</value>
835-
</data>
836827
<data name="RedeployCommit" xml:space="preserve">
837828
<value>Replace current deployment with '{0}' Id ?</value>
838829
</data>
@@ -1211,12 +1202,6 @@ use and privacy statement at &lt;url&gt; and (c) agree to sharing my contact inf
12111202
<data name="SwapWebsiteSlotWarning" xml:space="preserve">
12121203
<value>Are you sure you want to swap the website '{0}' production slot with slot '{1}'?</value>
12131204
</data>
1214-
<data name="UnableToCreateDjangoApp" xml:space="preserve">
1215-
<value>Unable to create Django application: {0}</value>
1216-
</data>
1217-
<data name="UnableToCreateDjangoAppFix" xml:space="preserve">
1218-
<value>Make sure you have Python 2.7 installed along with Django installed to site-packages.</value>
1219-
</data>
12201205
<data name="UnknownProviderMessage" xml:space="preserve">
12211206
<value>The provider {0} is unknown.</value>
12221207
</data>

‎src/Common/Commands.ScenarioTest/Resources/Automation/AutomationTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Checks whether the first string contains the second one
1818
#>
1919

20-
$accountName='safeer'
20+
$accountName='account'
2121
$location = "East US"
2222

2323
function AssertContains

‎src/ResourceManager/Batch/Commands.Batch.Test/BatchTestHelpers.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,43 @@ public static ListTasksResponse CreateListTasksResponse(IEnumerable<string> task
276276
return response;
277277
}
278278

279+
/// <summary>
280+
/// Builds a GetTaskFilePropertiesResponse object
281+
/// </summary>
282+
public static GetTaskFilePropertiesResponse CreateGetTaskFilePropertiesResponse(string fileName)
283+
{
284+
GetTaskFilePropertiesResponse response = new GetTaskFilePropertiesResponse();
285+
SetProperty(response, "StatusCode", HttpStatusCode.OK);
286+
287+
Azure.Batch.Protocol.Entities.File file = new Azure.Batch.Protocol.Entities.File();
288+
SetProperty(file, "Name", fileName);
289+
290+
SetProperty(response, "File", file);
291+
292+
return response;
293+
}
294+
295+
/// <summary>
296+
/// Builds a ListTaskFilesResponse object
297+
/// </summary>
298+
public static ListTaskFilesResponse CreateListTaskFilesResponse(IEnumerable<string> fileNames)
299+
{
300+
ListTaskFilesResponse response = new ListTaskFilesResponse();
301+
SetProperty(response, "StatusCode", HttpStatusCode.OK);
302+
303+
List<Azure.Batch.Protocol.Entities.File> files = new List<Azure.Batch.Protocol.Entities.File>();
304+
305+
foreach (string name in fileNames)
306+
{
307+
Azure.Batch.Protocol.Entities.File file = new Azure.Batch.Protocol.Entities.File();
308+
SetProperty(file, "Name", name);
309+
files.Add(file);
310+
}
311+
312+
SetProperty(response, "Files", files);
313+
314+
return response;
315+
}
279316

280317
/// <summary>
281318
/// Uses Reflection to set a property value on an object. Can be used to bypass restricted set accessors.

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@
154154
<Compile Include="Accounts\RemoveBatchAccountCommandTests.cs" />
155155
<Compile Include="Accounts\SetBatchAccountCommandTests.cs" />
156156
<Compile Include="BatchTestHelpers.cs" />
157+
<Compile Include="Files\GetBatchTaskFileCommandTests.cs" />
158+
<Compile Include="Files\GetBatchTaskFileContentCommandTests.cs" />
157159
<Compile Include="Jobs\GetBatchJobCommandTests.cs" />
158160
<Compile Include="Jobs\RemoveBatchJobCommandTests.cs" />
159161
<Compile Include="Models\BatchAccountContextTest.cs" />
@@ -163,6 +165,7 @@
163165
<Compile Include="Properties\AssemblyInfo.cs" />
164166
<Compile Include="ScenarioTests\BatchAccountTests.cs" />
165167
<Compile Include="ScenarioTests\BatchController.cs" />
168+
<Compile Include="ScenarioTests\FileTests.cs" />
166169
<Compile Include="ScenarioTests\JobTests.cs" />
167170
<Compile Include="ScenarioTests\PoolTests.cs" />
168171
<Compile Include="ScenarioTests\ScenarioTestHelpers.cs" />
@@ -186,6 +189,9 @@
186189
<None Include="ScenarioTests\Common.ps1">
187190
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
188191
</None>
192+
<None Include="ScenarioTests\FileTests.ps1">
193+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
194+
</None>
189195
<None Include="ScenarioTests\JobTests.ps1">
190196
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
191197
</None>
@@ -219,6 +225,30 @@
219225
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests\TestUpdatesExistingBatchAccount.json">
220226
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
221227
</None>
228+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestGetTaskFileByName.json">
229+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230+
</None>
231+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestGetTaskFileContentByName.json">
232+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
233+
</None>
234+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestGetTaskFileContentPipeline.json">
235+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
236+
</None>
237+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestListAllTaskFiles.json">
238+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
239+
</None>
240+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestListTaskFilePipeline.json">
241+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
242+
</None>
243+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestListTaskFilesByFilter.json">
244+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
245+
</None>
246+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestListTaskFilesRecursive.json">
247+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
248+
</None>
249+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.FileTests\TestListTaskFilesWithMaxCount.json">
250+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
251+
</None>
222252
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\TestDeleteJob.json">
223253
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
224254
</None>

0 commit comments

Comments
 (0)