Skip to content

Commit f2a8d2c

Browse files
committed
AzureRm.Storage module consuming api-version 2016-01-01 and common runtime
1 parent 64a4a05 commit f2a8d2c

File tree

197 files changed

+29338
-17050
lines changed

Some content is hidden

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

197 files changed

+29338
-17050
lines changed

src/StackAdmin/Stack.sln

Lines changed: 30 additions & 29 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 15
3-
VisualStudioVersion = 15.0.27703.2042
3+
VisualStudioVersion = 15.0.27130.2024
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
@@ -65,16 +65,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azs.Storage.Admin.Tests", "
6565
EndProject
6666
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\ResourceManager\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
6767
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute", "Compute\Commands.Compute\Commands.Compute.csproj", "{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}"
69-
EndProject
70-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network", "Network\Commands.Network\Commands.Network.csproj", "{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}"
71-
EndProject
7268
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
7369
EndProject
7470
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "Storage.Management\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}"
7571
EndProject
7672
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Utilities", "..\ServiceManagement\Services\Commands.Utilities\Commands.Utilities.csproj", "{4900EC4E-8DEB-4412-9108-0BC52F81D457}"
7773
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StorageSDK", "Storage.Management\SDK\StorageSDK.csproj", "{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}"
75+
EndProject
76+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage.Test", "Storage.Management\Commands.Management.Storage.Test\Commands.Management.Storage.Test.csproj", "{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}"
77+
EndProject
7878
Global
7979
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8080
Debug|Any CPU = Debug|Any CPU
@@ -409,30 +409,6 @@ Global
409409
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x64.Build.0 = Release|Any CPU
410410
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x86.ActiveCfg = Release|Any CPU
411411
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|x86.Build.0 = Release|Any CPU
412-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
413-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.Build.0 = Debug|Any CPU
414-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|x64.ActiveCfg = Debug|Any CPU
415-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|x64.Build.0 = Debug|Any CPU
416-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|x86.ActiveCfg = Debug|Any CPU
417-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|x86.Build.0 = Debug|Any CPU
418-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|Any CPU.ActiveCfg = Release|Any CPU
419-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|Any CPU.Build.0 = Release|Any CPU
420-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|x64.ActiveCfg = Release|Any CPU
421-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|x64.Build.0 = Release|Any CPU
422-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|x86.ActiveCfg = Release|Any CPU
423-
{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|x86.Build.0 = Release|Any CPU
424-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
425-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.Build.0 = Debug|Any CPU
426-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|x64.ActiveCfg = Debug|Any CPU
427-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|x64.Build.0 = Debug|Any CPU
428-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|x86.ActiveCfg = Debug|Any CPU
429-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|x86.Build.0 = Debug|Any CPU
430-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.ActiveCfg = Release|Any CPU
431-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.Build.0 = Release|Any CPU
432-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|x64.ActiveCfg = Release|Any CPU
433-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|x64.Build.0 = Release|Any CPU
434-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|x86.ActiveCfg = Release|Any CPU
435-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|x86.Build.0 = Release|Any CPU
436412
{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
437413
{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
438414
{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -469,6 +445,30 @@ Global
469445
{4900EC4E-8DEB-4412-9108-0BC52F81D457}.Release|x64.Build.0 = Release|Any CPU
470446
{4900EC4E-8DEB-4412-9108-0BC52F81D457}.Release|x86.ActiveCfg = Release|Any CPU
471447
{4900EC4E-8DEB-4412-9108-0BC52F81D457}.Release|x86.Build.0 = Release|Any CPU
448+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
449+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
450+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.ActiveCfg = Debug|Any CPU
451+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.Build.0 = Debug|Any CPU
452+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.ActiveCfg = Debug|Any CPU
453+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.Build.0 = Debug|Any CPU
454+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
455+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.Build.0 = Release|Any CPU
456+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.ActiveCfg = Release|Any CPU
457+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.Build.0 = Release|Any CPU
458+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.ActiveCfg = Release|Any CPU
459+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.Build.0 = Release|Any CPU
460+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
461+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
462+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.ActiveCfg = Debug|Any CPU
463+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.Build.0 = Debug|Any CPU
464+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.ActiveCfg = Debug|Any CPU
465+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.Build.0 = Debug|Any CPU
466+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
467+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.Build.0 = Release|Any CPU
468+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.ActiveCfg = Release|Any CPU
469+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.Build.0 = Release|Any CPU
470+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.ActiveCfg = Release|Any CPU
471+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.Build.0 = Release|Any CPU
472472
EndGlobalSection
473473
GlobalSection(SolutionProperties) = preSolution
474474
HideSolutionNode = FALSE
@@ -487,6 +487,7 @@ Global
487487
{B709EB4D-1AC7-4DED-8B51-89C023F27283} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
488488
{E3F4FE4B-108C-4369-8237-0EDBD9DDA369} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
489489
{BDF9F606-E419-4F24-B84F-B3BE6A92E9FA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
490+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
490491
EndGlobalSection
491492
GlobalSection(ExtensibilityGlobals) = postSolution
492493
SolutionGuid = {E3BEFC51-2FF1-4E69-B5D2-36E4D7446B7C}
Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
#
2+
# Module manifest for module 'PSGet_AzureRM.Storage'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 7/6/2017
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '1.1.0.1'
16+
17+
# Supported PSEditions
18+
# CompatiblePSEditions = @()
19+
20+
# ID used to uniquely identify this module
21+
GUID = 'da67eaa7-4cb1-4bfa-a194-8bf3faae8ac5'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = 'Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = 'Microsoft Azure PowerShell - Storage service management cmdlets for Azure Resource Manager. Creates and manages storage accounts in Azure Resource Manager.'
34+
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
PowerShellVersion = '3.0'
37+
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
40+
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
43+
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
DotNetFrameworkVersion = '4.5.2'
46+
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
CLRVersion = '4.0'
49+
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
52+
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.4'; },
55+
@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.1.1'; })
56+
57+
# Assemblies that must be loaded prior to importing this module
58+
# RequiredAssemblies = @()
59+
60+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
61+
# ScriptsToProcess = @()
62+
63+
# Type files (.ps1xml) to be loaded when importing this module
64+
# TypesToProcess = @()
65+
66+
# Format files (.ps1xml) to be loaded when importing this module
67+
FormatsToProcess = '.\Microsoft.Azure.Commands.Management.Storage.format.ps1xml'
68+
69+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
70+
NestedModules = @('.\Microsoft.Azure.Commands.Management.Storage.dll')
71+
72+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
73+
FunctionsToExport = @()
74+
75+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
76+
CmdletsToExport = 'Get-AzureRmStorageAccount', 'Get-AzureRmStorageAccountKey',
77+
'New-AzureRmStorageAccount', 'New-AzureRmStorageAccountKey',
78+
'Remove-AzureRmStorageAccount', 'Set-AzureRmCurrentStorageAccount',
79+
'Set-AzureRmStorageAccount',
80+
'Get-AzureRmStorageAccountNameAvailability',
81+
'Get-AzureRmStorageUsage'
82+
83+
# Variables to export from this module
84+
# VariablesToExport = @()
85+
86+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
87+
AliasesToExport = @()
88+
89+
# DSC resources to export from this module
90+
# DscResourcesToExport = @()
91+
92+
# List of all modules packaged with this module
93+
# ModuleList = @()
94+
95+
# List of all files packaged with this module
96+
# FileList = @()
97+
98+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
99+
PrivateData = @{
100+
101+
PSData = @{
102+
103+
# Tags applied to this module. These help with module discovery in online galleries.
104+
Tags = 'Azure','ResourceManager','ARM','Storage','StorageAccount'
105+
106+
# A URL to the license for this module.
107+
LicenseUri = 'https://aka.ms/azps-license'
108+
109+
# A URL to the main website for this project.
110+
ProjectUri = 'https://github.com/Azure/azure-powershell'
111+
112+
# A URL to an icon representing this module.
113+
# IconUri = ''
114+
115+
# ReleaseNotes of this module
116+
ReleaseNotes = 'Updated for common code changes'
117+
118+
# External dependent modules of this module
119+
# ExternalModuleDependencies = ''
120+
121+
} # End of PSData hashtable
122+
123+
} # End of PrivateData hashtable
124+
125+
# HelpInfo URI of this module
126+
# HelpInfoURI = ''
127+
128+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
129+
# DefaultCommandPrefix = ''
130+
131+
}
132+

src/StackAdmin/Storage.Management/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>Microsoft.Azure.Commands.Management.Storage.Test</AssemblyName>
1313
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
1717
<NuGetPackageImportStamp>f747f8a7</NuGetPackageImportStamp>
1818
<TargetFrameworkProfile />
@@ -40,10 +40,26 @@
4040
<Compile Include="TestController.cs" />
4141
</ItemGroup>
4242
<ItemGroup>
43+
<!-- <ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
44+
<Project>{70527617-7598-4aef-b5bd-db9186b8184b}</Project>
45+
<Name>Commands.Common.Authentication.Abstractions</Name>
46+
</ProjectReference>
47+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
48+
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
49+
<Name>Commands.Common.Authentication</Name>
50+
</ProjectReference>
51+
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj">
52+
<Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
53+
<Name>Commands.ScenarioTests.ResourceManager.Common</Name>
54+
</ProjectReference> -->
4355
<ProjectReference Include="..\Commands.Management.Storage\Commands.Management.Storage.csproj">
4456
<Project>{a50ab133-5c04-4a17-9054-f8343683ec23}</Project>
4557
<Name>Commands.Management.Storage</Name>
4658
</ProjectReference>
59+
<ProjectReference Include="..\SDK\StorageSDK.csproj">
60+
<Project>{ccc1f6c7-e2ce-47b3-bd64-8efd17823e20}</Project>
61+
<Name>StorageSDK</Name>
62+
</ProjectReference>
4763
</ItemGroup>
4864
<ItemGroup>
4965
<None Include="packages.config">
@@ -76,9 +92,6 @@
7692
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
7793
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7894
</None>
79-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureRmStorageAccountKeySource.json">
80-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
81-
</None>
8295
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
8396
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8497
</None>

src/StackAdmin/Storage.Management/Commands.Management.Storage.Test/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@
4747
// You can specify all the values or you can default the Build and Revision Numbers
4848
// by using the '*' as shown below:
4949

50-
[assembly: AssemblyVersion("1.0.4")]
51-
[assembly: AssemblyFileVersion("1.0.4")]
50+
[assembly: AssemblyVersion("1.0.6")]
51+
[assembly: AssemblyFileVersion("1.0.6")]
52+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/StackAdmin/Storage.Management/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@
1313
// ----------------------------------------------------------------------------------
1414

1515

16+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1617
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1718
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1819
using Xunit;
20+
using Xunit.Abstractions;
1921

2022
namespace Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests
2123
{
2224
public class StorageAccountTests : RMTestBase
2325
{
26+
public StorageAccountTests(ITestOutputHelper output)
27+
{
28+
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
29+
}
30+
2431
[Fact]
2532
[Trait(Category.AcceptanceType, Category.CheckIn)]
2633
public void TestStorageAccount()
@@ -76,7 +83,7 @@ public void TestPipingGetAccountToGetKey()
7683
{
7784
TestController.NewInstance.RunPsTest("Test-PipingGetAccountToGetKey");
7885
}
79-
86+
8087
[Fact]
8188
[Trait(Category.AcceptanceType, Category.CheckIn)]
8289
public void TestPipingSetStorageAccount()

0 commit comments

Comments
 (0)