Merge pull request Azure#2817 from hyonholee/dev

Add ComputeImageAttributes parameters to OSImageDetailsContext object…

Author: markcowl

src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/ImagePublishing/GetAzurePlatformVMImage.cs

@@ -64,6 +64,9 @@ protected override void OnProcessRecord()
                         IsCorrupted = imageDetails.IsCorrupted,
                         SmallIconUri = imageDetails.SmallIconUri,
                         PublisherName = imageDetails.PublisherName,
+                        Offer = (imageDetails.ComputeImageAttributes == null) ? string.Empty : imageDetails.ComputeImageAttributes.Offer,
+                        Sku = (imageDetails.ComputeImageAttributes == null) ? string.Empty : imageDetails.ComputeImageAttributes.Sku,
+                        Version = (imageDetails.ComputeImageAttributes == null) ? string.Empty : imageDetails.ComputeImageAttributes.Version,
                         ReplicationProgress = imageDetails.ReplicationProgress.Select(
                                                detail => new ReplicationProgressContext
                                                {

src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Model/OSImageDetailsContext.cs

@@ -21,5 +21,8 @@ public class OSImageDetailsContext : OSImageContext
     {
         public bool? IsCorrupted { get; set; }
         public List<ReplicationProgressContext> ReplicationProgress { get; set; }
+        public string Offer { get; set; }
+        public string Sku { get; set; }
+        public string Version { get; set; }
     }
-}
+}

src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Model/VMImageDetailsContext.cs

@@ -17,8 +17,5 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageReposit
     public class VMImageDetailsContext : OSImageDetailsContext
     {
         public string SharingStatus { get; set; }
-        public string Offer { get; set; }
-        public string Sku { get; set; }
-        public string Version { get; set; }
     }
 }