Skip to content

Commit a323cc6

Browse files
stankovskistankovski
committed
Merge pull request Azure#377 from wastoresh/dev
Move ARM storage account management cmdlets to a new project.
2 parents 01d2830 + ce4c1d8 commit a323cc6

File tree

37 files changed

+2430
-1569
lines changed

37 files changed

+2430
-1569
lines changed

‎src/AzurePowershell.sln

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.21005.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -210,6 +210,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement", "R
210210
EndProject
211211
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.Test", "ResourceManager\ApiManagement\Commands.ApiManagement.Test\Commands.ApiManagement.Test.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}"
212212
EndProject
213+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "ResourceManager\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}"
214+
EndProject
215+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage.Test", "ResourceManager\Storage\Commands.Management.Storage.Test\Commands.Management.Storage.Test.csproj", "{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}"
216+
EndProject
213217
Global
214218
GlobalSection(SolutionConfigurationPlatforms) = preSolution
215219
Debug|Any CPU = Debug|Any CPU
@@ -512,12 +516,19 @@ Global
512516
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
513517
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
514518
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.Build.0 = Release|Any CPU
519+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
520+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
521+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
522+
{A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU
523+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
524+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
525+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
526+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.Build.0 = Release|Any CPU
515527
EndGlobalSection
516528
GlobalSection(SolutionProperties) = preSolution
517529
HideSolutionNode = FALSE
518530
EndGlobalSection
519531
GlobalSection(NestedProjects) = preSolution
520-
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
521532
{37455286-D8A7-4E0C-8B4D-C517D20C641A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
522533
{D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
523534
{A3965B66-5A3E-4B8C-9574-28E5958D4828} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -528,6 +539,7 @@ Global
528539
{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
529540
{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
530541
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
542+
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
531543
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
532544
{374D4000-DEDE-4995-9B63-E3B9FE0C4D29} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
533545
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -553,5 +565,6 @@ Global
553565
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
554566
{59D1B5DC-9175-43EC-90C6-CBA601B3565F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
555567
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
568+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
556569
EndGlobalSection
557570
EndGlobal

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
</ItemGroup>
146146
<ItemGroup>
147147
<Compile Include="Common\ComputeTestController.cs" />
148-
<Compile Include="ScenarioTests\StorageAccountTests.cs" />
149148
<Compile Include="ScenarioTests\VirtualMachineProfileTests.cs" />
150149
<Compile Include="ScenarioTests\AvailabilitySetTests.cs" />
151150
<Compile Include="ScenarioTests\VirtualMachineExtensionTests.cs" />
@@ -196,9 +195,6 @@
196195
</None>
197196
<None Include="MSSharedLibKey.snk" />
198197
<None Include="packages.config" />
199-
<None Include="ScenarioTests\StorageAccountTests.ps1">
200-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
201-
</None>
202198
<None Include="ScenarioTests\VirtualMachineProfileTests.ps1">
203199
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
204200
</None>
@@ -220,30 +216,6 @@
220216
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AvailabilitySetTests\TestAvailabilitySet.json">
221217
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
222218
</None>
223-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestGetAzureStorageAccount.json">
224-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
225-
</None>
226-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestGetAzureStorageAccountKey.json">
227-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
228-
</None>
229-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestNewAzureStorageAccount.json">
230-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
231-
</None>
232-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestNewAzureStorageAccountKey.json">
233-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
234-
</None>
235-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestPipingGetAccountToGetKey.json">
236-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
237-
</None>
238-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
239-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
240-
</None>
241-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
242-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
243-
</None>
244-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StorageAccountTests\TestStorageAccount.json">
245-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
246-
</None>
247219
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineAccessExtension.json">
248220
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
249221
</None>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<DebugSymbols>true</DebugSymbols>
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
23-
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Compute</OutputPath>
23+
<OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Compute\</OutputPath>
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
@@ -164,7 +164,6 @@
164164
<Compile Include="Extension\GetAzureVMExtensionCommand.cs" />
165165
<Compile Include="Images\GetAzureVMImageCommand.cs" />
166166
<Compile Include="Models\HashTableExtensions.cs" />
167-
<Compile Include="Models\PSStorageAccount.cs" />
168167
<Compile Include="Extension\VMAccess\GetAzureVMAccessExtension.cs" />
169168
<Compile Include="Extension\VMAccess\RemoveAzureVMAccessExtension.cs" />
170169
<Compile Include="Extension\VMAccess\SetAzureVMAccessExtension.cs" />
@@ -188,15 +187,7 @@
188187
<Compile Include="Models\LocationStringExtensions.cs" />
189188
<Compile Include="RemoteDesktop\VirtualMachineRemoteDesktopBaseCmdlet.cs" />
190189
<Compile Include="RemoteDesktop\GetAzureRemoteDesktopFileCommand.cs" />
191-
<Compile Include="StorageAccount\StorageManagementClient.cs" />
192190
<Compile Include="Models\SourceImageReferenceExtension.cs" />
193-
<Compile Include="StorageAccount\GetAzureStorageAccount.cs" />
194-
<Compile Include="StorageAccount\GetAzureStorageAccountKey.cs" />
195-
<Compile Include="StorageAccount\NewAzureStorageAccount.cs" />
196-
<Compile Include="StorageAccount\NewAzureStorageAccountKey.cs" />
197-
<Compile Include="StorageAccount\RemoveAzureStorageAccount.cs" />
198-
<Compile Include="StorageAccount\SetAzureStorageAccount.cs" />
199-
<Compile Include="StorageAccount\StorageAccountBaseCmdlet.cs" />
200191
<Compile Include="Usage\GetAzureVMUsageCommand.cs" />
201192
<Compile Include="Usage\VirtualMachineUsageBaseCmdlet.cs" />
202193
<Compile Include="VirtualMachineSizes\GetAzureVMSizeCommand.cs" />

0 commit comments

Comments
 (0)