Skip to content

Commit a8d21ee

Browse files
author
Maddie Clayton
authored
Merge pull request #7041 from bganapa/storage-2018
AzureRm.Storage module consuming api-version 2016-01-01 and common runtime
2 parents 8b13b75 + adba9c6 commit a8d21ee

File tree

112 files changed

+9051
-15612
lines changed

Some content is hidden

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

112 files changed

+9051
-15612
lines changed

‎build.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@
470470
<!-- Stack -->
471471
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
472472
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Exclude="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*Common*.dll" />
473+
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Management.Storage.dll" />
473474
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
474475
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" />
475476
</ItemGroup>

‎src/StackAdmin/Stack.sln

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "Dns\Command
8181
EndProject
8282
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{81E4373B-42EC-445E-9A40-06C44F29099A}"
8383
EndProject
84+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StorageSDK", "Storage.Management\SDK\StorageSDK.csproj", "{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}"
85+
EndProject
86+
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}"
87+
EndProject
8488
Global
8589
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8690
Debug|Any CPU = Debug|Any CPU
@@ -511,6 +515,30 @@ Global
511515
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x64.Build.0 = Release|Any CPU
512516
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.ActiveCfg = Release|Any CPU
513517
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.Build.0 = Release|Any CPU
518+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
519+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
520+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.ActiveCfg = Debug|Any CPU
521+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.Build.0 = Debug|Any CPU
522+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.ActiveCfg = Debug|Any CPU
523+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.Build.0 = Debug|Any CPU
524+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
525+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.Build.0 = Release|Any CPU
526+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.ActiveCfg = Release|Any CPU
527+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.Build.0 = Release|Any CPU
528+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.ActiveCfg = Release|Any CPU
529+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.Build.0 = Release|Any CPU
530+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
531+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
532+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.ActiveCfg = Debug|Any CPU
533+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.Build.0 = Debug|Any CPU
534+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.ActiveCfg = Debug|Any CPU
535+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.Build.0 = Debug|Any CPU
536+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
537+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.Build.0 = Release|Any CPU
538+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.ActiveCfg = Release|Any CPU
539+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.Build.0 = Release|Any CPU
540+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.ActiveCfg = Release|Any CPU
541+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.Build.0 = Release|Any CPU
514542
EndGlobalSection
515543
GlobalSection(SolutionProperties) = preSolution
516544
HideSolutionNode = FALSE
@@ -531,6 +559,7 @@ Global
531559
{BDF9F606-E419-4F24-B84F-B3BE6A92E9FA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
532560
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
533561
{81E4373B-42EC-445E-9A40-06C44F29099A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
562+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
534563
EndGlobalSection
535564
GlobalSection(ExtensibilityGlobals) = postSolution
536565
SolutionGuid = {E3BEFC51-2FF1-4E69-B5D2-36E4D7446B7C}

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

Lines changed: 5 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 />
@@ -44,6 +44,10 @@
4444
<Project>{a50ab133-5c04-4a17-9054-f8343683ec23}</Project>
4545
<Name>Commands.Management.Storage</Name>
4646
</ProjectReference>
47+
<ProjectReference Include="..\SDK\StorageSDK.csproj">
48+
<Project>{ccc1f6c7-e2ce-47b3-bd64-8efd17823e20}</Project>
49+
<Name>StorageSDK</Name>
50+
</ProjectReference>
4751
</ItemGroup>
4852
<ItemGroup>
4953
<None Include="packages.config">
@@ -76,9 +80,6 @@
7680
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
7781
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7882
</None>
79-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureRmStorageAccountKeySource.json">
80-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
81-
</None>
8283
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
8384
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8485
</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)