Added the ability to change a subscriptions billing cycle. (#41)

Author: idwilliams-2

docs/help/New-PartnerAccessToken.md

@@ -22,8 +22,8 @@ New-PartnerAccessToken -ApplicationId <String> [-Credential <PSCredential>] [-En
 
 ### ServicePrincipal
 ```
-New-PartnerAccessToken -Credential <PSCredential> [-Environment <EnvironmentName>] -TenantId <String>
- [-TokenCache <TokenCache>] [<CommonParameters>]
+New-PartnerAccessToken -Credential <PSCredential> [-Environment <EnvironmentName>] [-ServicePrincipal]
+ -TenantId <String> [-TokenCache <TokenCache>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -109,6 +109,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ServicePrincipal
+A flag indicating that a service principal will be used to authenticate.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ServicePrincipal
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -TenantId
 The Azure AD domain or tenant identifier.
 

docs/help/Set-PartnerCustomerSubscription.md

@@ -16,16 +16,16 @@ Updates the specified customer subscription.
 
 ### Customer
 ```
-Set-PartnerCustomerSubscription [-AutoRenew <Boolean>] -CustomerId <String> [-FriendlyName <String>]
- [-Quantity <Int32>] [-Status <SubscriptionStatus>] -SubscriptionId <String> [-WhatIf] [-Confirm]
- [<CommonParameters>]
+Set-PartnerCustomerSubscription [-AutoRenew <Boolean>] [-BillingCycle <BillingCycleType>] -CustomerId <String>
+ [-FriendlyName <String>] [-Quantity <Int32>] [-Status <SubscriptionStatus>] -SubscriptionId <String> [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ### CustomerObject
 ```
-Set-PartnerCustomerSubscription [-AutoRenew <Boolean>] -InputObject <PSCustomer> [-FriendlyName <String>]
- [-Quantity <Int32>] [-Status <SubscriptionStatus>] -SubscriptionId <String> [-WhatIf] [-Confirm]
- [<CommonParameters>]
+Set-PartnerCustomerSubscription [-AutoRenew <Boolean>] -InputObject <PSCustomer>
+ [-BillingCycle <BillingCycleType>] [-FriendlyName <String>] [-Quantity <Int32>] [-Status <SubscriptionStatus>]
+ -SubscriptionId <String> [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -57,6 +57,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -BillingCycle
+The billing cycle for the subscription.
+
+```yaml
+Type: BillingCycleType
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -CustomerId
 The customer identifier used to scope the request.
 

src/Core.Models/Core.Models.csproj

@@ -4,6 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.Store.PartnerCenter.Core.Models</AssemblyName>
     <RootNamespace>Microsoft.Store.PartnerCenter.Core.Models</RootNamespace>
+    <Version>1.5.1811.3</Version>
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft Corporation</Company>
+    <PackageLicenseUrl>https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>

src/Core/Core.csproj

@@ -4,6 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.Store.PartnerCenter.Core</AssemblyName>
     <RootNamespace>Microsoft.Store.PartnerCenter.Core</RootNamespace>
+    <Version>1.5.1811.3</Version>
+    <Company>Microsoft Corporation</Company>
+    <Authors>Microsoft</Authors>
+    <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
+    <PackageIconUrl />
+    <PackageLicenseUrl>https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
   <ItemGroup>

src/PowerShell/Commands/ConnectPartnerCenter.cs

@@ -32,7 +32,12 @@ public class ConnectPartnerCenter : PSCmdlet, IModuleAssemblyInitializer
         private const string AccessTokenParameterSet = "AccessToken";
 
         /// <summary>
-        /// THe name of the configuration property.
+        /// The name of the assembly version property.
+        /// </summary>
+        private const string AssemblyVersionProperty = "AssemblyVersion";
+
+        /// <summary>
+        /// The name of the configuration property.
         /// </summary>
         private const string ConfigurationProperty = "Configuration";
 
@@ -101,7 +106,7 @@ public class ConnectPartnerCenter : PSCmdlet, IModuleAssemblyInitializer
         /// <summary>
         /// Gets or sets a flag indicating that a service principal will be used to authenticate.
         /// </summary
-        [Parameter(HelpMessage = "A flag indiicating that a service principal will be used to authenticate.", Mandatory = true, ParameterSetName = ServicePrincipalParameterSet)]
+        [Parameter(HelpMessage = "A flag indicating that a service principal will be used to authenticate.", Mandatory = true, ParameterSetName = ServicePrincipalParameterSet)]
         public SwitchParameter ServicePrincipal { get; set; }
 
         /// <summary>
@@ -138,13 +143,21 @@ protected override void BeginProcessing()
         public void OnImport()
         {
             PropertyInfo prop = PartnerService.Instance.GetType().GetProperty(
-                ConfigurationProperty, 
+                ConfigurationProperty,
                 BindingFlags.Instance | BindingFlags.NonPublic);
 
             dynamic configuration = prop.GetValue(PartnerService.Instance);
 
+            // Override the value for the Partner Center client property.
             configuration.PartnerCenterClient = PartnerCenterClient;
 
+            prop = PartnerService.Instance.GetType().GetProperty(
+                AssemblyVersionProperty,
+                BindingFlags.Instance | BindingFlags.NonPublic);
+
+            // Override the value for the assembly version property.
+            prop.SetValue(PartnerService.Instance, typeof(ConnectPartnerCenter).Assembly.GetName().Version.ToString());
+
             if (PartnerSession.Instance.AuthenticationFactory == null)
             {
                 PartnerSession.Instance.AuthenticationFactory = new AuthenticationFactory();

src/PowerShell/Commands/GetPartnerCustomerSubscription.cs

@@ -10,10 +10,10 @@ namespace Microsoft.Store.PartnerCenter.PowerShell.Commands
     using System.Management.Automation;
     using System.Text.RegularExpressions;
     using Common;
+    using Models.Customers;
+    using Models.Subscriptions;
     using PartnerCenter.Models;
     using PartnerCenter.Models.Subscriptions;
-    using PartnerCenter.PowerShell.Models.Customers;
-    using PartnerCenter.PowerShell.Models.Subscriptions;
 
     [Cmdlet(VerbsCommon.Get, "PartnerCustomerSubscription", DefaultParameterSetName = "Customer"), OutputType(typeof(PSSubscription))]
     public class GetPartnerCustomerSubscription : PartnerPSCmdlet

src/PowerShell/Commands/NewPartnerAccessToken.cs

@@ -48,7 +48,7 @@ public class NewPartnerAccessToken : PSCmdlet
         /// <summary>
         /// Gets or sets a flag indicating that a service principal will be used to authenticate.
         /// </summary
-        [Parameter(HelpMessage = "A flag indiicating that a service principal will be used to authenticate.", Mandatory = true, ParameterSetName = "ServicePrincipal")]
+        [Parameter(HelpMessage = "A flag indicating that a service principal will be used to authenticate.", Mandatory = true, ParameterSetName = "ServicePrincipal")]
         public SwitchParameter ServicePrincipal { get; set; }
 
         /// <summary>

src/PowerShell/Commands/SetPartnerCustomerSubscription.cs

@@ -6,11 +6,14 @@
 
 namespace Microsoft.Store.PartnerCenter.PowerShell.Commands
 {
+    using System.Collections.Generic;
     using System.Globalization;
     using System.Management.Automation;
     using System.Text.RegularExpressions;
     using Models.Customers;
     using Models.Subscriptions;
+    using PartnerCenter.Models.Offers;
+    using PartnerCenter.Models.Orders;
     using PartnerCenter.Models.Subscriptions;
     using Properties;
 
@@ -30,6 +33,13 @@ public class SetPartnerCustomerSubscription : PartnerPSCmdlet
         [Parameter(HelpMessage = "The customer object used to scope the request.", ParameterSetName = "CustomerObject", Mandatory = true)]
         public PSCustomer InputObject { get; set; }
 
+        /// <summary>
+        /// Gets or sets the billing cycle for the subscription.
+        /// </summary>
+        [Parameter(HelpMessage = "The billing cycle for the subscription.", Mandatory = false)]
+        [ValidateSet(nameof(BillingCycleType.Annual), nameof(BillingCycleType.Monthly))]
+        public BillingCycleType? BillingCycle { get; set; }
+
         /// <summary>
         /// Gets or sets the customer identifier.
         /// </summary>
@@ -56,6 +66,7 @@ public class SetPartnerCustomerSubscription : PartnerPSCmdlet
         /// </summary>
         [Parameter(HelpMessage = "The status of the subscription.", ParameterSetName = "Customer", Mandatory = false)]
         [Parameter(HelpMessage = "The status of the subscription.", ParameterSetName = "CustomerObject", Mandatory = false)]
+        [ValidateSet(nameof(SubscriptionStatus.Active), nameof(SubscriptionStatus.Suspended))]
         public SubscriptionStatus? Status { get; set; }
 
         /// <summary>
@@ -91,6 +102,28 @@ public override void ExecuteCmdlet()
                 subscription.AutoRenewEnabled = AutoRenew.Value;
             }
 
+            if (BillingCycle.HasValue)
+            {
+                Partner.Customers[customerId].Orders[subscription.OrderId].Patch(new Order
+                {
+                    BillingCycle = BillingCycle.Value,
+                    LineItems = new List<OrderLineItem>
+                    {
+                       new OrderLineItem
+                       {
+                           LineItemNumber = 0,
+                           OfferId = subscription.OfferId,
+                           ParentSubscriptionId = subscription.ParentSubscriptionId,
+                           SubscriptionId = subscription.Id,
+                           Quantity = subscription.Quantity
+                       }
+                    },
+                    ReferenceCustomerId = customerId
+                });
+
+                subscription.BillingCycle = BillingCycle.Value;
+            }
+
             if (!string.IsNullOrEmpty(FriendlyName))
             {
                 subscription.FriendlyName = FriendlyName;