Merge pull request Azure#3871 from twitchax/preview_fix

Revert "Implement Send-Feedback cmdlet."

Author: markcowl

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -224,7 +224,7 @@ protected bool CheckIfInteractive()
                 }
             }
 
-            if (!interactive && _dataCollectionProfile != null && !_dataCollectionProfile.EnableAzureDataCollection.HasValue)
+            if (!interactive && !_dataCollectionProfile.EnableAzureDataCollection.HasValue)
             {
                 _dataCollectionProfile.EnableAzureDataCollection = false;
             }

src/Common/Commands.Common/MetricHelper.cs

@@ -16,8 +16,6 @@
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -106,19 +104,6 @@ public void LogQoSEvent(AzurePSQoSEvent qos, bool isUsageMetricEnabled, bool isE
             }
         }
 
-        public void LogCustomEvent<T>(string eventName, T payload, bool force = false)
-        {
-            if (!force && !IsMetricTermAccepted())
-            {
-                return;
-            }
-
-            foreach (TelemetryClient client in TelemetryClients)
-            {
-                client.TrackEvent(eventName, SerializeCustomEventPayload(payload));
-            }
-        }
-
         private void LogUsageEvent(AzurePSQoSEvent qos)
         {
             foreach (TelemetryClient client in TelemetryClients)
@@ -233,21 +218,6 @@ public static string GenerateSha256HashString(string originInput)
                 return BitConverter.ToString(bytes);
             }
         }
-
-        /// <summary>
-        /// Generate a serialized payload for custom events.
-        /// </summary>
-        /// <param name="payload">The payload object for the custom event.</param>
-        /// <returns>The serialized payload.</returns>
-        public static Dictionary<string, string> SerializeCustomEventPayload<T>(T payload)
-        {
-            var payloadAsJson = JsonConvert.SerializeObject(payload, new JsonSerializerSettings
-            {
-                ContractResolver = new CamelCasePropertyNamesContractResolver()
-            });
-
-            return JsonConvert.DeserializeObject<Dictionary<string, string>>(payloadAsJson);
-        }
     }
 }
 

src/ResourceManager/Profile/ChangeLog.md

@@ -18,7 +18,6 @@
         - Additional information about change #1
 -->
 ## Current Release
-* Added `Send-Feedback' cmdlet: allows a user to initiate a set of prompts which sends feedback to the Azure PowerShell team.
 
 ## Version 2.8.0
 * *Obsolete*: Save-AzureRmProfile is renamed to Save-AzureRmContext, there is an alias to the old cmdlet name, the alias will be removed in the next release.

src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj

@@ -191,7 +191,6 @@
     <Compile Include="ProfileController.cs" />
     <Compile Include="RPRegistrationDelegatingHandlerTests.cs" />
     <Compile Include="SubscriptionCmdletTests.cs" />
-    <Compile Include="SendFeedbackTests.cs" />
     <Compile Include="TelemetryTests.cs" />
     <Compile Include="TenantCmdletTests.cs" />
     <Compile Include="LoginCmdletTests.cs" />

src/ResourceManager/Profile/Commands.Profile.Test/SendFeedbackTests.cs

@@ -131,11 +131,9 @@
     <Compile Include="Environment\GetAzureRMEnvironment.cs" />
     <Compile Include="Environment\SetAzureRMEnvironment.cs" />
     <Compile Include="Environment\AddAzureRMEnvironment.cs" />
-    <Compile Include="Feedback\SendFeedback.cs" />
     <Compile Include="Models\ModelExtensions.cs" />
     <Compile Include="Models\PSAzureContext.cs" />
     <Compile Include="Models\PSAzureEnvironment.cs" />
-    <Compile Include="Models\PSAzureFeedback.cs" />
     <Compile Include="Models\PSAzureProfile.cs" />
     <Compile Include="Models\PSAzureRmAccount.cs" />
     <Compile Include="Models\PSAzureSubscription.cs" />

src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

@@ -220,25 +220,6 @@
   <data name="SelectedSubscriptionNotActive" xml:space="preserve">
     <value>Selected subscription is in '{0}' state. </value>
   </data>
-  <data name="SendFeedbackEmailQuestion" xml:space="preserve">
-    <value>Please enter your email if you are interested in providing follow up information:</value>
-  </data>
-  <data name="SendFeedbackNegativeCommentsQuestion" xml:space="preserve">
-    <value>Upon what could Azure PowerShell improve? </value>
-  </data>
-  <data name="SendFeedbackNonInteractiveMessage" xml:space="preserve">
-    <value>{0} must be issued in interactive mode.</value>
-    <comment>{0} is nameof feedback cmdlet</comment>
-  </data>
-  <data name="SendFeedbackOutOfRangeMessage" xml:space="preserve">
-    <value>The value entered was either not convertible to an integer or out of range [0, 10].</value>
-  </data>
-  <data name="SendFeedbackPositiveCommentsQuestion" xml:space="preserve">
-    <value>What does Azure PowerShell do well?</value>
-  </data>
-  <data name="SendFeedbackRecommendationQuestion" xml:space="preserve">
-    <value>With zero (0) being the least and ten (10) being the most, how likely are you to recommend Azure PowerShell to a friend or colleague?</value>
-  </data>
   <data name="SetAzureRmContextNoParameterSet" xml:space="preserve">
     <value>Please provide either a subscription ID, subscription name, tenant Id or domain.</value>
   </data>

src/ResourceManager/Profile/Commands.Profile/Feedback/SendFeedback.cs

@@ -37,7 +37,7 @@ public override void ExecuteCmdlet()
         {
             var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
 
-            WriteObject(profileClient.ListTenants(TenantId).Cast<PSAzureTenant>(), enumerateCollection: true);
+            WriteObject(profileClient.ListTenants(TenantId).Select((t) => (PSAzureTenant)t), enumerateCollection: true);
         }
     }
 }