v1.1.0 b fixed configuration and removed experiment flag

marcosqlbi · marcosqlbi · commit 372772119c14 · 2020-08-18T17:21:49.000+02:00
diff --git a/AnalyzeInExcel/App.xaml.cs b/AnalyzeInExcel/App.xaml.cs
@@ -120,15 +120,12 @@ protected override void OnStartup(StartupEventArgs e)
                                 this.MainWindow = splashScreen;
                                 splashScreen.Show();
 
-                                bool experiment = (((App)Current).AppOptions != null) ? ((App)Current).AppOptions.Experiment : false;
-                                bool excelStarted = false;
-                                if (experiment)
+                                bool excelStarted = ExcelHelper.CreateInstanceWithPivotTable(serverName, databaseName, cubeName, (ex) => th.TrackException(ex));
+                                if (excelStarted)
                                 {
-                                    excelStarted = ExcelHelper.CreateInstanceWithPivotTable(serverName, databaseName, cubeName, (ex) => th.TrackException(ex));
-                                    if (excelStarted) th.TrackEvent(EV_RUNEXCEL, "RunType", "Interop");
+                                    th.TrackEvent(EV_RUNEXCEL, "RunType", "Interop");
                                 }
-                                if (!excelStarted)
-                                {
+                                else {
                                     RunExcelProcess(serverName, databaseName, cubeName);
                                     th.TrackEvent(EV_RUNEXCEL, "RunType", "ODC File");
                                 }
diff --git a/AnalyzeInExcel/Options.cs b/AnalyzeInExcel/Options.cs
@@ -13,7 +13,7 @@ public class Options
         [Option('n', "telemetry", HelpText = "Enable Telemetry")]
         public bool Telemetry { get; set; }
 
-        [Option('x', "experiment", HelpText = "Experiment feature")]
-        public bool Experiment { get; set; }
+        //[Option('x', "experiment", HelpText = "Experiment feature")]
+        //public bool Experiment { get; set; }
     }
 }
diff --git a/ExternalToolsInstaller/ExternalToolsInstaller.cs b/ExternalToolsInstaller/ExternalToolsInstaller.cs
@@ -198,5 +198,6 @@ private void ExternalToolsInstaller_AfterUninstall(object sender, InstallEventAr
                 throw;
             }
         }
+
     }
 }
diff --git a/SetupAnalyzeInExcel/SetupAnalyzeInExcel.vdproj b/SetupAnalyzeInExcel/SetupAnalyzeInExcel.vdproj
@@ -3420,8 +3420,8 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Analyze in Excel for Power BI Desktop"
-        "ProductCode" = "8:{FD892738-C170-4D2F-9C67-8C2DA5272C8D}"
-        "PackageCode" = "8:{753DFF51-E645-408C-91D9-38540E786CDF}"
+        "ProductCode" = "8:{74F9C867-CF8A-4950-8406-6697988E2C17}"
+        "PackageCode" = "8:{3069CC2A-89EA-49B7-8DE5-444F6035B395}"
         "UpgradeCode" = "8:{FC2F9C00-CAD5-455E-BD9D-B1C607F4ABDA}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"

Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,12 @@ protected override void OnStartup(StartupEventArgs e)`
`120`	`120`	`this.MainWindow = splashScreen;`
`121`	`121`	`splashScreen.Show();`
`122`	`122`
`123`		`- bool experiment = (((App)Current).AppOptions != null) ? ((App)Current).AppOptions.Experiment : false;`
`124`		`- bool excelStarted = false;`
`125`		`- if (experiment)`
	`123`	`+ bool excelStarted = ExcelHelper.CreateInstanceWithPivotTable(serverName, databaseName, cubeName, (ex) => th.TrackException(ex));`
	`124`	`+ if (excelStarted)`
`126`	`125`	`{`
`127`		`- excelStarted = ExcelHelper.CreateInstanceWithPivotTable(serverName, databaseName, cubeName, (ex) => th.TrackException(ex));`
`128`		`- if (excelStarted) th.TrackEvent(EV_RUNEXCEL, "RunType", "Interop");`
	`126`	`+ th.TrackEvent(EV_RUNEXCEL, "RunType", "Interop");`
`129`	`127`	`}`
`130`		`- if (!excelStarted)`
`131`		`- {`
	`128`	`+ else {`
`132`	`129`	`RunExcelProcess(serverName, databaseName, cubeName);`
`133`	`130`	`th.TrackEvent(EV_RUNEXCEL, "RunType", "ODC File");`
`134`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class Options`
`13`	`13`	`[Option('n', "telemetry", HelpText = "Enable Telemetry")]`
`14`	`14`	`public bool Telemetry { get; set; }`
`15`	`15`
`16`		`- [Option('x', "experiment", HelpText = "Experiment feature")]`
`17`		`- public bool Experiment { get; set; }`
	`16`	`+ //[Option('x', "experiment", HelpText = "Experiment feature")]`
	`17`	`+ //public bool Experiment { get; set; }`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,5 +198,6 @@ private void ExternalToolsInstaller_AfterUninstall(object sender, InstallEventAr`
`198`	`198`	`throw;`
`199`	`199`	`}`
`200`	`200`	`}`
	`201`	`+`
`201`	`202`	`}`
`202`	`203`	`}`