Use Subscription SDK nuget.

wilcobmsft · wilcobmsft · commit 5bc522c4add8 · 2017-11-30T18:58:35.000-08:00
diff --git a/src/ResourceManager/Subscription/Commands.Subscription.Test/Commands.Subscription.Test.csproj b/src/ResourceManager/Subscription/Commands.Subscription.Test/Commands.Subscription.Test.csproj
@@ -62,9 +62,9 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.Subscription, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.8.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Subscription.1.0.0-preview\lib\net452\Microsoft.Azure.Management.Subscription.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/Subscription/Commands.Subscription.Test/ScenarioTests/TestController.cs b/src/ResourceManager/Subscription/Commands.Subscription.Test/ScenarioTests/TestController.cs
@@ -26,7 +26,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using SubscriptionDefinitionClient = Microsoft.Azure.Management.ResourceManager.SubscriptionDefinitionsClient;
+using SubscriptionDefinitionClient = Microsoft.Azure.Management.Subscription.SubscriptionDefinitionsClient;
 using TestBase = Microsoft.Azure.Test.TestBase;
 using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
 using TestUtilities = Microsoft.Azure.Test.TestUtilities;
diff --git a/src/ResourceManager/Subscription/Commands.Subscription.Test/packages.config b/src/ResourceManager/Subscription/Commands.Subscription.Test/packages.config
@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.ResourceManager" version="1.8.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.Subscription" version="1.0.0-preview" targetFramework="net452" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Cmdlets/GetAzureRmSubscriptionDefinition.cs b/src/ResourceManager/Subscription/Commands.Subscription/Cmdlets/GetAzureRmSubscriptionDefinition.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.Subscription.Common;
 using Microsoft.Azure.Commands.Subscription.Models;
-using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.Subscription;
 using System.Collections.Generic;
 using System.Management.Automation;
 
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Cmdlets/NewAzureRmSubscriptionDefinition.cs b/src/ResourceManager/Subscription/Commands.Subscription/Cmdlets/NewAzureRmSubscriptionDefinition.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.Subscription.Common;
 using Microsoft.Azure.Commands.Subscription.Models;
-using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.Subscription;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,7 +39,7 @@ public override void ExecuteCmdlet()
         {
             if (this.ShouldProcess(target: this.Name, action: "Create subscription definition"))
             {
-                this.WriteSubscriptionDefinitionObject(this.SubscriptionDefinitionsClient.SubscriptionDefinitions.Create(this.Name, new Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition(
+                this.WriteSubscriptionDefinitionObject(this.SubscriptionDefinitionsClient.SubscriptionDefinitions.Create(this.Name, new Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition(
                     offerType: this.OfferType,
                     subscriptionDisplayName: this.SubscriptionDisplayName ?? this.Name)));
             }
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.csproj b/src/ResourceManager/Subscription/Commands.Subscription/Commands.Subscription.csproj
@@ -42,9 +42,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.Subscription, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.8.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Subscription.1.0.0-preview\lib\net452\Microsoft.Azure.Management.Subscription.dll</HintPath>
     </Reference>
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web" />
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Common/AzureSubscriptionDefinitionCmdletBase.cs b/src/ResourceManager/Subscription/Commands.Subscription/Common/AzureSubscriptionDefinitionCmdletBase.cs
@@ -16,7 +16,7 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Commands.Subscription.Models;
-using Microsoft.Azure.Management.ResourceManager;
+using Microsoft.Azure.Management.Subscription;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -44,12 +44,12 @@ public ISubscriptionDefinitionsClient SubscriptionDefinitionsClient
             set { _subscriptionDefinitionClient = value; }
         }
 
-        protected void WriteSubscriptionDefinitionObject(Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition subscriptionDefinition)
+        protected void WriteSubscriptionDefinitionObject(Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition subscriptionDefinition)
         {
             this.WriteObject(new PSSubscriptionDefinition(subscriptionDefinition));
         }
 
-        protected void WriteSubscriptionDefinitionObjects(IEnumerable<Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition> subscriptionDefinitions)
+        protected void WriteSubscriptionDefinitionObjects(IEnumerable<Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition> subscriptionDefinitions)
         {
             this.WriteObject(subscriptionDefinitions.Select(x => new PSSubscriptionDefinition(x)), enumerateCollection: true);
         }
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/Models/PSSubscriptionDefinition.cs b/src/ResourceManager/Subscription/Commands.Subscription/Models/PSSubscriptionDefinition.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using ApiSubscriptionDefinition = Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition;
+using ApiSubscriptionDefinition = Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition;
 
 namespace Microsoft.Azure.Commands.Subscription.Models
 {
diff --git a/src/ResourceManager/Subscription/Commands.Subscription/packages.config b/src/ResourceManager/Subscription/Commands.Subscription/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.Management.ResourceManager" version="1.8.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.Subscription" version="1.0.0-preview" targetFramework="net452" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`using Microsoft.Azure.Commands.Subscription.Common;`
`16`	`16`	`using Microsoft.Azure.Commands.Subscription.Models;`
`17`		`-using Microsoft.Azure.Management.ResourceManager;`
	`17`	`+using Microsoft.Azure.Management.Subscription;`
`18`	`18`	`using System.Collections;`
`19`	`19`	`using System.Collections.Generic;`
`20`	`20`	`using System.Linq;`
`@@ -39,7 +39,7 @@ public override void ExecuteCmdlet()`
`39`	`39`	`{`
`40`	`40`	`if (this.ShouldProcess(target: this.Name, action: "Create subscription definition"))`
`41`	`41`	`{`
`42`		`- this.WriteSubscriptionDefinitionObject(this.SubscriptionDefinitionsClient.SubscriptionDefinitions.Create(this.Name, new Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition(`
	`42`	`+ this.WriteSubscriptionDefinitionObject(this.SubscriptionDefinitionsClient.SubscriptionDefinitions.Create(this.Name, new Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition(`
`43`	`43`	`offerType: this.OfferType,`
`44`	`44`	`subscriptionDisplayName: this.SubscriptionDisplayName ?? this.Name)));`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`using Microsoft.Azure.Commands.Common.Authentication.Abstractions;`
`17`	`17`	`using Microsoft.Azure.Commands.ResourceManager.Common;`
`18`	`18`	`using Microsoft.Azure.Commands.Subscription.Models;`
`19`		`-using Microsoft.Azure.Management.ResourceManager;`
	`19`	`+using Microsoft.Azure.Management.Subscription;`
`20`	`20`	`using System.Collections.Generic;`
`21`	`21`	`using System.Linq;`
`22`	`22`
`@@ -44,12 +44,12 @@ public ISubscriptionDefinitionsClient SubscriptionDefinitionsClient`
`44`	`44`	`set { _subscriptionDefinitionClient = value; }`
`45`	`45`	`}`
`46`	`46`
`47`		`- protected void WriteSubscriptionDefinitionObject(Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition subscriptionDefinition)`
	`47`	`+ protected void WriteSubscriptionDefinitionObject(Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition subscriptionDefinition)`
`48`	`48`	`{`
`49`	`49`	`this.WriteObject(new PSSubscriptionDefinition(subscriptionDefinition));`
`50`	`50`	`}`
`51`	`51`
`52`		`- protected void WriteSubscriptionDefinitionObjects(IEnumerable<Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition> subscriptionDefinitions)`
	`52`	`+ protected void WriteSubscriptionDefinitionObjects(IEnumerable<Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition> subscriptionDefinitions)`
`53`	`53`	`{`
`54`	`54`	`this.WriteObject(subscriptionDefinitions.Select(x => new PSSubscriptionDefinition(x)), enumerateCollection: true);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
`15`		`-using ApiSubscriptionDefinition = Microsoft.Azure.Management.ResourceManager.Models.SubscriptionDefinition;`
	`15`	`+using ApiSubscriptionDefinition = Microsoft.Azure.Management.Subscription.Models.SubscriptionDefinition;`
`16`	`16`
`17`	`17`	`namespace Microsoft.Azure.Commands.Subscription.Models`
`18`	`18`	`{`