Addressed an issue with requesting products. (#108)

* Addressed an issue with requesting products.

* Updated the release notes

* Added the other support catalog types.

Author: idwilliams-2

ChangeLog.md

@@ -20,7 +20,12 @@
 
 # Change Log
 
-## Upcoming Release
+## 1.5.1903.6
+
+* Products 
+  * Addressed an issue with requesting products
+
+## 1.5.1903.5
 
 * Auditing
   * Added new operation and resource types

docs/help/Get-PartnerProduct.md

@@ -45,7 +45,7 @@ A string that the product catalog.
 Type: String
 Parameter Sets: ByCatalog
 Aliases:
-Accepted values: Azure, OnlineServices, Software
+Accepted values: Azure, AzureReservations, AzureReservationsVM, AzureReservationsSQL, AzureReservationsCosmosDb, OnlineServices, Software, SoftwareSUSELinux, SoftwarePerpetual, SoftwareSubscriptions
 
 Required: True
 Position: Named

src/PartnerCenter.TestFramework/PartnerCenter.TestFramework.csproj

@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>1.5.1903.5</Version>
+    <Version>1.5.1903.6</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
 

src/PartnerCenter/Models/JsonConverters/EnumJsonConverter.cs

@@ -7,6 +7,7 @@
 namespace Microsoft.Store.PartnerCenter.Models.JsonConverters
 {
     using System;
+    using Extensions;
     using System.Globalization;
     using System.Text;
     using Newtonsoft.Json;
@@ -41,6 +42,18 @@ public override bool CanConvert(Type objectType)
         /// <returns>The object that represents the serialized JSON.</returns>
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
+            reader.AssertNotNull(nameof(reader));
+            objectType.AssertNotNull(nameof(objectType));
+
+            if (!objectType.IsEnum)
+            {
+                throw new JsonSerializationException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, 
+                        "EnumJsonConverter cannot deserialize '{0}' values", 
+                        objectType.Name));
+            }
+
             if (reader.TokenType == JsonToken.String)
             {
                 return Enum.Parse(objectType, JScriptToPascalCase(reader.Value.ToString()));
@@ -49,8 +62,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             {
                 return Enum.ToObject(objectType, reader.Value);
             }
-
-            throw new NotImplementedException();
+            else
+            {
+                throw new JsonSerializationException(string.Format(CultureInfo.InvariantCulture, "EnumJsonConverter cannot deserialize '{0}' values", reader.TokenType));
+            }
         }
 
         /// <summary>

src/PartnerCenter/PartnerCenter.csproj

@@ -9,7 +9,7 @@
     <Copyright>Copyright ©  2019</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Product>Microsoft Partner Center</Product>
-    <Version>1.5.1903.5</Version>
+    <Version>1.5.1903.6</Version>
     <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>

src/PartnerCenter/Products/ProductCollectionByCountryByTargetViewByTargetSegmentOperations.cs

@@ -17,7 +17,6 @@ namespace Microsoft.Store.PartnerCenter.Products
 
     internal class ProductCollectionByCountryByTargetViewByTargetSegmentOperations : BasePartnerComponent<Tuple<string, string, string>>, IProductCollectionByCountryByTargetViewByTargetSegment
     {
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ProductCollectionByCountryByTargetViewByTargetSegmentOperations" /> class.
         /// </summary>

src/PartnerCenter/Products/ProductCollectionByCountryByTargetViewOperations.cs

@@ -40,7 +40,11 @@ public ProductCollectionByCountryByTargetViewOperations(IPartner rootPartnerOper
         /// <returns>The product collection operations by country, by target view and by target segment.</returns>
         public IProductCollectionByCountryByTargetViewByTargetSegment ByTargetSegment(string targetSegment)
         {
-            throw new NotImplementedException();
+            return new ProductCollectionByCountryByTargetViewByTargetSegmentOperations(
+                Partner,
+                Context.Item1,
+                Context.Item2,
+                targetSegment);
         }
 
         /// <summary>
@@ -57,7 +61,7 @@ public async Task<ResourceCollection<Product>> GetAsync(CancellationToken cancel
                     Context.Item2
                 },
                 {
-                    PartnerService.Instance.Configuration.Apis.GetProducts.Parameters.TargetSegment,
+                    PartnerService.Instance.Configuration.Apis.GetProducts.Parameters.TargetView,
                     Context.Item1
                 }
             };

src/PowerShell/Commands/GetPartnerProduct.cs

@@ -38,7 +38,7 @@ public class GetPartnerProduct : PartnerPSCmdlet
         /// Gets or sets the product catalog.
         /// </summary>
         [Parameter(ParameterSetName = "ByCatalog", Mandatory = true, HelpMessage = "A string that the product catalog.")]
-        [ValidateSet("Azure", "OnlineServices", "Software")]
+        [ValidateSet("Azure", "AzureReservations", "AzureReservationsVM", "AzureReservationsSQL", "AzureReservationsCosmosDb", "OnlineServices", "Software", "SoftwareSUSELinux", "SoftwarePerpetual", "SoftwareSubscriptions")]
         public string Catalog { get; set; }
 
         /// <summary>

src/PowerShell/PartnerCenter.NetCore.psd1

@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 03/15/2019
+# Generated on: 03/25/2019
 #
 
 @{
     # Script module or binary module file associated with this manifest.
     RootModule = 'Microsoft.Store.PartnerCenter.PowerShell.dll'
 
     # Version number of this module.
-    ModuleVersion = '1.5.1903.1'
+    ModuleVersion = '1.5.1903.6'
 
     # Supported PSEditions
     CompatiblePSEditions = 'Core', 'Desktop'
@@ -200,7 +200,7 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'Added commands to manage application consents.'
+            ReleaseNotes = ''
 
             # Prerelease string of this module
             # Prerelease = 'preview'

src/PowerShell/PartnerCenter.psd1

@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 03/15/2019
+# Generated on: 03/25/2019
 #
 
 @{
     # Script module or binary module file associated with this manifest.
     RootModule = 'Microsoft.Store.PartnerCenter.PowerShell.dll'
 
     # Version number of this module.
-    ModuleVersion = '1.5.1903.1'
+    ModuleVersion = '1.5.1903.6'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -201,7 +201,7 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'Added commands to manage application consents.'
+            ReleaseNotes = ''
 
             # Prerelease string of this module
             # Prerelease = 'preview'