Skip to content

Commit b67ebde

Browse files
committed
Renaming SubscriptionDefinition module to Subscription module to be better forward compatible.
1 parent 23b4c46 commit b67ebde

30 files changed

+102
-102
lines changed

TestMappings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
"src/ResourceManager/StreamAnalytics/": [
124124
".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
125125
],
126-
"src/ResourceManager/SubscriptionDefinition/": [
127-
".\\src\\ResourceManager\\SubscriptionDefinition\\Commands.SubscriptionDefinition.Test\\bin\\Debug\\Microsoft.Azure.Commands.SubscriptionDefinition.Test.dll"
126+
"src/ResourceManager/Subscription/": [
127+
".\\src\\ResourceManager\\Subscription\\Commands.Subscription.Test\\bin\\Debug\\Microsoft.Azure.Commands.Subscription.Test.dll"
128128
],
129129
"src/ResourceManager/Tags/": [],
130130
"src/ResourceManager/TrafficManager/": [

src/ResourceManager/SubscriptionDefinition/AzureRM.SubscriptionDefinition.psd1 renamed to src/ResourceManager/Subscription/AzureRM.Subscription.psd1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Module manifest for module 'PSGet_AzureRM.SubscriptionDefinition'
2+
# Module manifest for module 'PSGet_AzureRM.Subscription'
33
#
44
# Generated by: Microsoft Corporation
55
#
@@ -30,7 +30,7 @@ CompanyName = 'Microsoft Corporation'
3030
Copyright = 'Microsoft Corporation. All rights reserved.'
3131

3232
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell - Subscription Definition cmdlets for Azure Resource Manager'
33+
Description = 'Microsoft Azure PowerShell - Subscription cmdlets for Azure Resource Manager'
3434

3535
# Minimum version of the Windows PowerShell engine required by this module
3636
PowerShellVersion = '3.0'
@@ -63,10 +63,10 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll'
6363
# TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
66-
FormatsToProcess = '.\Microsoft.Azure.Commands.SubscriptionDefinition.Format.ps1xml'
66+
FormatsToProcess = '.\Microsoft.Azure.Commands.Subscription.Format.ps1xml'
6767

6868
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
NestedModules = @('.\Microsoft.Azure.Commands.SubscriptionDefinition.dll')
69+
NestedModules = @('.\Microsoft.Azure.Commands.Subscription.dll')
7070

7171
# 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.
7272
FunctionsToExport = @()
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ProjectGuid>{79260EE2-A9A6-4D27-9B2C-B84F12A6A1D4}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Microsoft.Azure.Commands.SubscriptionDefinition.Test</RootNamespace>
13-
<AssemblyName>Microsoft.Azure.Commands.SubscriptionDefinition.Test</AssemblyName>
12+
<RootNamespace>Microsoft.Azure.Commands.Subscription.Test</RootNamespace>
13+
<AssemblyName>Microsoft.Azure.Commands.Subscription.Test</AssemblyName>
1414
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<TargetFrameworkProfile />
@@ -148,13 +148,13 @@
148148
<None Include="ScenarioTests\SubscriptionDefinitionTests.ps1">
149149
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150150
</None>
151-
<None Include="SessionRecords\SubscriptionDefinition.Test.ScenarioTests.SubscriptionDefinitionTests\TestGetSubscriptionDefinitionByName.json">
151+
<None Include="SessionRecords\Subscription.Test.ScenarioTests.SubscriptionDefinitionTests\TestGetSubscriptionDefinitionByName.json">
152152
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
153153
</None>
154-
<None Include="SessionRecords\SubscriptionDefinition.Test.ScenarioTests.SubscriptionDefinitionTests\TestListSubscriptionDefinitions.json">
154+
<None Include="SessionRecords\Subscription.Test.ScenarioTests.SubscriptionDefinitionTests\TestListSubscriptionDefinitions.json">
155155
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
156156
</None>
157-
<None Include="SessionRecords\SubscriptionDefinition.Test.ScenarioTests.SubscriptionDefinitionTests\TestNewSubscriptionDefinition.json">
157+
<None Include="SessionRecords\Subscription.Test.ScenarioTests.SubscriptionDefinitionTests\TestNewSubscriptionDefinition.json">
158158
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
159159
</None>
160160
</ItemGroup>
@@ -187,9 +187,9 @@
187187
<Project>{8058d403-06e3-4bed-8924-d166ce303961}</Project>
188188
<Name>Commands.Resources.Rest</Name>
189189
</ProjectReference>
190-
<ProjectReference Include="..\Commands.SubscriptionDefinition\Commands.SubscriptionDefinition.csproj">
190+
<ProjectReference Include="..\Commands.Subscription\Commands.Subscription.csproj">
191191
<Project>{8C6489F5-0352-4667-8A0D-86B4B399EECC}</Project>
192-
<Name>Commands.SubscriptionDefinition</Name>
192+
<Name>Commands.Subscription</Name>
193193
</ProjectReference>
194194
</ItemGroup>
195195
<ItemGroup>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// General Information about an assembly is controlled through the following
1919
// set of attributes. Change these attribute values to modify the information
2020
// associated with an assembly.
21-
[assembly: AssemblyTitle("Commands.SubscriptionDefinition.Test")]
21+
[assembly: AssemblyTitle("Commands.Subscription.Test")]
2222
[assembly: AssemblyDescription("")]
2323
[assembly: AssemblyConfiguration("")]
2424
[assembly: AssemblyCompany("")]
25-
[assembly: AssemblyProduct("Commands.SubscriptionDefinition.Test")]
25+
[assembly: AssemblyProduct("Commands.Subscription.Test")]
2626
[assembly: AssemblyCopyright("Copyright (c) 2017")]
2727
[assembly: AssemblyTrademark("")]
2828
[assembly: AssemblyCulture("")]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.ScenarioTest;
16-
using Microsoft.Azure.Commands.SubscriptionDefinition.Test.ScenarioTests.ScenarioTest;
16+
using Microsoft.Azure.Commands.Subscription.Test.ScenarioTests.ScenarioTest;
1717
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1919
using Xunit;
2020

21-
namespace SubscriptionDefinition.Test.ScenarioTests
21+
namespace Subscription.Test.ScenarioTests
2222
{
2323
public class SubscriptionDefinitionTests
2424
{
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
3232
using TestUtilities = Microsoft.Azure.Test.TestUtilities;
3333

34-
namespace Microsoft.Azure.Commands.SubscriptionDefinition.Test.ScenarioTests.ScenarioTest
34+
namespace Microsoft.Azure.Commands.Subscription.Test.ScenarioTests.ScenarioTest
3535
{
3636
public class TestController : RMTestBase
3737
{
@@ -132,7 +132,7 @@ public void RunPsTestWorkflow(
132132

133133
_helper.SetupModules(AzureModule.AzureResourceManager,
134134
_helper.RMProfileModule,
135-
@"AzureRM.SubscriptionDefinition.psd1",
135+
@"AzureRM.Subscription.psd1",
136136
"ScenarioTests\\" + callingClassName + ".ps1");
137137
try
138138
{
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"FxVersion/4.7.2556.0",
1717
"OSName/Windows_10_Enterprise",
1818
"OSVersion/6.3.16299",
19-
"Microsoft.Azure.Management.ResourceManager.SubscriptionDefinitionsClient/1.6.0-preview"
19+
"Microsoft.Azure.Management.Subscription.SubscriptionDefinitionsClient/1.0.0-preview"
2020
]
2121
},
2222
"ResponseBody": "{\r\n \"id\": \"/providers/Microsoft.Subscription/subscriptionDefinitions/MyProdSubscription\",\r\n \"name\": \"MyProdSubscription\",\r\n \"properties\": {\r\n \"etag\": \"MfjP0w==\",\r\n \"subscriptionDisplayName\": \"MyProdSubscription\",\r\n \"subscriptionId\": \"86869d42-1782-4337-98b0-c905fb937d46\",\r\n \"offerType\": \"MS-AZR-0017P\"\r\n },\r\n \"type\": \"Microsoft.Subscription/subscriptionDefinitions\"\r\n}",
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"FxVersion/4.7.2556.0",
1717
"OSName/Windows_10_Enterprise",
1818
"OSVersion/6.3.16299",
19-
"Microsoft.Azure.Management.ResourceManager.SubscriptionDefinitionsClient/1.6.0-preview"
19+
"Microsoft.Azure.Management.Subscription.SubscriptionDefinitionsClient/1.0.0-preview"
2020
]
2121
},
2222
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/providers/Microsoft.Subscription/subscriptionDefinitions/MyProdSubscription\",\r\n \"name\": \"MyProdSubscription\",\r\n \"properties\": {\r\n \"etag\": \"MfjP0w==\",\r\n \"subscriptionDisplayName\": \"MyProdSubscription\",\r\n \"subscriptionId\": \"86869d42-1782-4337-98b0-c905fb937d46\",\r\n \"offerType\": \"MS-AZR-0017P\"\r\n },\r\n \"type\": \"Microsoft.Subscription/subscriptionDefinitions\"\r\n },\r\n {\r\n \"id\": \"/providers/Microsoft.Subscription/subscriptionDefinitions/e2esubprod1\",\r\n \"name\": \"e2esubprod1\",\r\n \"properties\": {\r\n \"etag\": \"To8acg==\",\r\n \"subscriptionDisplayName\": \"mye2esubprod1\",\r\n \"subscriptionId\": \"430ed244-e513-4b13-b113-e877158ed7f5\",\r\n \"offerType\": \"MS-AZR-0017P\"\r\n },\r\n \"type\": \"Microsoft.Subscription/subscriptionDefinitions\"\r\n },\r\n {\r\n \"id\": \"/providers/Microsoft.Subscription/subscriptionDefinitions/e2esubprod6\",\r\n \"name\": \"e2esubprod6\",\r\n \"properties\": {\r\n \"etag\": \"YRP88g==\",\r\n \"subscriptionDisplayName\": \"e2esubprod6\",\r\n \"subscriptionId\": \"a21087f6-05f2-4be3-a831-185aad424df6\",\r\n \"offerType\": \"MS-AZR-0148P\"\r\n },\r\n \"type\": \"Microsoft.Subscription/subscriptionDefinitions\"\r\n },\r\n {\r\n \"id\": \"/providers/Microsoft.Subscription/subscriptionDefinitions/e2esubprod7\",\r\n \"name\": \"e2esubprod7\",\r\n \"properties\": {\r\n \"etag\": \"DqdLvg==\",\r\n \"subscriptionDisplayName\": \"e2esubprod7\",\r\n \"subscriptionId\": \"519fce51-f304-4f10-9d03-777b7c47c8f0\",\r\n \"offerType\": \"MS-AZR-0148P\"\r\n },\r\n \"type\": \"Microsoft.Subscription/subscriptionDefinitions\"\r\n }\r\n ]\r\n}",

0 commit comments

Comments
 (0)