Skip to content

Commit da21c02

Browse files
author
begoldsm
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 4b95a0c + 4485b9b commit da21c02

File tree

184 files changed

+69972
-25957
lines changed

Some content is hidden

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

184 files changed

+69972
-25957
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,9 @@
799799
<Component Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" Guid="*">
800800
<File Id="fil892929A39A2451E6645B06A1071C7377" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
801801
</Component>
802+
<Component Id="cmpCD37CD8F92CDF2D1325CCF4EDCB62243" Guid="*">
803+
<File Id="filD4DA4D8E757F8C680D2F6FF42AB03467" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.Tags.dll" />
804+
</Component>
802805
<Component Id="cmp88675FAFCC394892AE7CA0D31046C931" Guid="*">
803806
<File Id="fil01D0A4B8CAE4F47AEBAC371F9D4F3CC6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Common.Authentication.dll" />
804807
</Component>
@@ -876,6 +879,9 @@
876879
<Component Id="cmpBE1007C3B5920359FED93D232612FA3D" Guid="*">
877880
<File Id="fil047FE0D96A04BAE24E62453BB735322B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
878881
</Component>
882+
<Component Id="cmpA9CADA5F5DC40E8AD15DF60107CC92D1" Guid="*">
883+
<File Id="fil6F014B6352009ABA00697624C40BED36" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.dll" />
884+
</Component>
879885
<Component Id="cmp2FE5183EB7E0125AD6C4A8101AB4B55E" Guid="*">
880886
<File Id="fil73D92F1878FF0973F6F1359DAA67D3E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Common.Authentication.dll" />
881887
</Component>
@@ -1054,6 +1060,9 @@
10541060
<Component Id="cmp0A73501EDFCB1876C97F2D4B520F3E35" Guid="*">
10551061
<File Id="filD8B12535344A334C842789DD3B3774B3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Common.NetFramework.dll" />
10561062
</Component>
1063+
<Component Id="cmp7EBE3286268B848A8C4813AC64EA4C34" Guid="*">
1064+
<File Id="fil86BDA115F7354D65E9204115899B1774" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Graph.RBAC.dll" />
1065+
</Component>
10571066
<Component Id="cmp84DA44BC01768FB21E1664FF352CB56B" Guid="*">
10581067
<File Id="fil4A5FD068B0A21617E9A7ABB9BEDC9BBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Management.HDInsight.dll" />
10591068
</Component>
@@ -1128,6 +1137,9 @@
11281137
<Component Id="cmpDE49418D6A95612CBD93742D9123E2CF" Guid="*">
11291138
<File Id="filA451CC480035933973D458DE27E4D654" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Insights.dll-Help.xml" />
11301139
</Component>
1140+
<Component Id="cmp3096FA61D43597AB3DBA27FAB68B4EC2" Guid="*">
1141+
<File Id="fil62116E4EF563120D14399871EDB98344" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Insights.format.ps1xml" />
1142+
</Component>
11311143
<Component Id="cmp8F9B65CD236700EB14DA4817C1688FF7" Guid="*">
11321144
<File Id="filB91A22127B334BFB27FD1A7E442994C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
11331145
</Component>
@@ -4851,6 +4863,7 @@
48514863
<ComponentRef Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" />
48524864
<ComponentRef Id="cmpBFBF6E4B62912618B79304EFC6838BAB" />
48534865
<ComponentRef Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" />
4866+
<ComponentRef Id="cmpCD37CD8F92CDF2D1325CCF4EDCB62243" />
48544867
<ComponentRef Id="cmp88675FAFCC394892AE7CA0D31046C931" />
48554868
<ComponentRef Id="cmpD3A3362A8365705FDC0C19B312EB61FC" />
48564869
<ComponentRef Id="cmp096EEC3ACF260985958CED2DC04BD9A9" />
@@ -4876,6 +4889,7 @@
48764889
<ComponentRef Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" />
48774890
<ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
48784891
<ComponentRef Id="cmpBE1007C3B5920359FED93D232612FA3D" />
4892+
<ComponentRef Id="cmpA9CADA5F5DC40E8AD15DF60107CC92D1" />
48794893
<ComponentRef Id="cmp2FE5183EB7E0125AD6C4A8101AB4B55E" />
48804894
<ComponentRef Id="cmp87FB43928F7A2ECF62C0141446D21A9F" />
48814895
<ComponentRef Id="cmpD2292657EF3D9CEAC5D4FA7DEB3E7E8E" />
@@ -4934,6 +4948,7 @@
49344948
<ComponentRef Id="cmp49102F1945E979B50A0C7307B0191B58" />
49354949
<ComponentRef Id="cmp327D63D4E47C0C921CB8B578A78012CD" />
49364950
<ComponentRef Id="cmp0A73501EDFCB1876C97F2D4B520F3E35" />
4951+
<ComponentRef Id="cmp7EBE3286268B848A8C4813AC64EA4C34" />
49374952
<ComponentRef Id="cmp84DA44BC01768FB21E1664FF352CB56B" />
49384953
<ComponentRef Id="cmpA1C271511C8C2910A9ADBC85D928D54C" />
49394954
<ComponentRef Id="cmp8F725CF358AB23BDABE18B5FE9B73BFA" />
@@ -4958,6 +4973,7 @@
49584973
<ComponentRef Id="cmp183CE3EAEAA01DB989815CD9E22E1975" />
49594974
<ComponentRef Id="cmp20A05509BD755C1EF519D072611A0E0F" />
49604975
<ComponentRef Id="cmpDE49418D6A95612CBD93742D9123E2CF" />
4976+
<ComponentRef Id="cmp3096FA61D43597AB3DBA27FAB68B4EC2" />
49614977
<ComponentRef Id="cmp8F9B65CD236700EB14DA4817C1688FF7" />
49624978
<ComponentRef Id="cmpBAEB22D1B0161CF31028E4EC6CFCE47E" />
49634979
<ComponentRef Id="cmpA848C04563692D93B90821EE8960E3B4" />

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<Reference Include="Hyak.Common">
4444
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Microsoft.Azure.Batch, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<Reference Include="Microsoft.Azure.Batch, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\..\packages\Azure.Batch.2.0.1\lib\net45\Microsoft.Azure.Batch.dll</HintPath>
48+
<HintPath>..\..\..\packages\Azure.Batch.2.0.2\lib\net45\Microsoft.Azure.Batch.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Microsoft.Azure.Common">
5151
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Batch">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.4.0\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.5.0\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -216,10 +216,12 @@
216216
<Compile Include="ScenarioTests\JobTests.cs" />
217217
<Compile Include="ScenarioTests\PoolTests.cs" />
218218
<Compile Include="ScenarioTests\ScenarioTestHelpers.cs" />
219+
<Compile Include="ScenarioTests\SubscriptionTests.cs" />
219220
<Compile Include="ScenarioTests\TaskTests.cs" />
220221
<Compile Include="ScenarioTests\ComputeNodeUserTests.cs" />
221222
<Compile Include="ScenarioTests\ComputeNodeTests.cs" />
222223
<Compile Include="ScenarioTests\JobScheduleTests.cs" />
224+
<Compile Include="Subscriptions\GetBatchSubscriptionQuotasCommandTests.cs" />
223225
<Compile Include="Tasks\GetBatchTaskCommandTests.cs" />
224226
<Compile Include="Tasks\NewBatchTaskCommandTests.cs" />
225227
<Compile Include="Tasks\RemoveBatchTaskCommandTests.cs" />
@@ -270,6 +272,9 @@
270272
<None Include="ScenarioTests\PoolTests.ps1">
271273
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
272274
</None>
275+
<None Include="ScenarioTests\SubscriptionTests.ps1">
276+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
277+
</None>
273278
<None Include="ScenarioTests\TaskTests.ps1">
274279
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
275280
</None>
@@ -561,6 +566,9 @@
561566
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.PoolTests\TestUpdatePool.json">
562567
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
563568
</None>
569+
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.SubscriptionTests\TestGetSubscriptionQuotas.json">
570+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
571+
</None>
564572
<None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests\TestCreateTask.json">
565573
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
566574
</None>

0 commit comments

Comments
 (0)