Skip to content

AzureRm.Storage module consuming api-version 2016-01-01 and common runtime #6864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

AzureRm.Storage module consuming api-version 2016-01-01 and common runtime #6864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04f0fe4
AzureRm.Storage module consuming api-version 2016-01-01 and common ru…
bganapa Aug 7, 2018
eb48884
Removing Compute project from stack.sln
bganapa Aug 7, 2018
6c098d5
removing network project from stack.sln
bganapa Aug 7, 2018
67fc020
Credscan Issues, fixing recorded session records for keys
bganapa Aug 8, 2018
78c1384
Addressing review comments
bganapa Aug 15, 2018
3fcf37e
Split SDK out into it's own project
deathly809 Aug 21, 2018
7667d9c
Fix DLL Issues
deathly809 Aug 22, 2018
7e29fc8
Merge pull request #2 from deathly809/stack-storage
bganapa Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/ResourceManager/Storage/Stack/AzureRM.Storage.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '1.0.5.4'
ModuleVersion = '1.1.0.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -51,8 +51,8 @@ CLRVersion = '4.0'
# ProcessorArchitecture = ''

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; },
@{ModuleName = 'Azure.Storage'; ModuleVersion = '1.0.5.4'; })
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.4'; },
@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.1.1'; })

# Assemblies that must be loaded prior to importing this module
# RequiredAssemblies = @()
Expand All @@ -73,11 +73,11 @@ NestedModules = @('.\Microsoft.Azure.Commands.Management.Storage.dll')
FunctionsToExport = @()

# 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.
CmdletsToExport = 'Get-AzureRmStorageAccount', 'Get-AzureRmStorageAccountKey',
'New-AzureRmStorageAccount', 'New-AzureRmStorageAccountKey',
'Remove-AzureRmStorageAccount', 'Set-AzureRmCurrentStorageAccount',
'Set-AzureRmStorageAccount',
'Get-AzureRmStorageAccountNameAvailability',
CmdletsToExport = 'Get-AzureRmStorageAccount', 'Get-AzureRmStorageAccountKey',
'New-AzureRmStorageAccount', 'New-AzureRmStorageAccountKey',
'Remove-AzureRmStorageAccount', 'Set-AzureRmCurrentStorageAccount',
'Set-AzureRmStorageAccount',
'Get-AzureRmStorageAccountNameAvailability',
'Get-AzureRmStorageUsage'

# Variables to export from this module
Expand Down Expand Up @@ -119,7 +119,7 @@ PrivateData = @{
# ExternalModuleDependencies = ''

} # End of PSData hashtable

} # End of PrivateData hashtable

# HelpInfo URI of this module
Expand Down
11 changes: 6 additions & 5 deletions ...er/Storage/Stack/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<HintPath>..\..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.11\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.13\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
Expand Down Expand Up @@ -145,6 +145,10 @@
<Project>{a50ab133-5c04-4a17-9054-f8343683ec23}</Project>
<Name>Commands.Management.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\SDK\StorageSDK.csproj">
<Project>{ccc1f6c7-e2ce-47b3-bd64-8efd17823e20}</Project>
<Name>StorageSDK</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
Expand Down Expand Up @@ -181,9 +185,6 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureRmStorageAccountKeySource.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -198,4 +199,4 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
5 changes: 3 additions & 2 deletions ...ResourceManager/Storage/Stack/Commands.Management.Storage.Test/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("1.0.4")]
[assembly: AssemblyFileVersion("1.0.4")]
[assembly: AssemblyVersion("1.0.6")]
[assembly: AssemblyFileVersion("1.0.6")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
9 changes: 8 additions & 1 deletion ...nager/Storage/Stack/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,21 @@
// ----------------------------------------------------------------------------------


using Microsoft.Azure.ServiceManagemenet.Common.Models;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
using Xunit;
using Xunit.Abstractions;

namespace Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests
{
public class StorageAccountTests : RMTestBase
{
public StorageAccountTests(ITestOutputHelper output)
{
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestStorageAccount()
Expand Down Expand Up @@ -76,7 +83,7 @@ public void TestPipingGetAccountToGetKey()
{
TestController.NewInstance.RunPsTest("Test-PipingGetAccountToGetKey");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestPipingSetStorageAccount()
Expand Down
Loading