Merge branch 'bidshelper-vsix'

furmangg · furmangg · commit 949c915914cb · 2018-11-21T10:52:15.000-06:00
diff --git a/BidsHelper2017.pkgdef.bak b/BidsHelper2017.pkgdef.bak
diff --git a/Core/VersionInfo.cs b/Core/VersionInfo.cs
@@ -9,7 +9,7 @@ public class VersionInfo
     {
         // BIDS Helper Assembly & VSIX Version
         // N.B. Manually update the manifest file, if you change this - See source.extension.vsixmanifest
-        public const string Version = "2.2.0";
+        public const string Version = "2.2.1";
 
         private static readonly object lockResource = new object();
         private static Version visualStudioVersion;
diff --git a/Manifest/SQL2017/VSPackageVS2017.resx b/Manifest/SQL2017/VSPackageVS2017.resx
@@ -121,7 +121,7 @@
     <value>BI Developer Extensions 2017 Extension</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>BI Developer Extensions 2017 Visual Studio Extension v2.2.0 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions 2017 Visual Studio Extension v2.2.1 - An add-in to extend SQL Server Data Tools</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
diff --git a/Manifest/SQL2017/source.extension.vsixmanifest b/Manifest/SQL2017/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.2.0" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.2.1" Language="en-US" Publisher="bideveloperextensions.github.io" />
         <DisplayName>BI Developer Extensions for Visual Studio 2017</DisplayName>
         <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects</Description>
         <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>
diff --git a/SQL2017_VS2017_BidsHelper.csproj b/SQL2017_VS2017_BidsHelper.csproj
@@ -794,11 +794,6 @@
       <HintPath>DLLs\SQL2017\Reference\Microsoft.SqlServer.ManagedDTS.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>DLLs\SQL2017\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.AnalysisServices.Controls">
       <HintPath>DLLs\SQL2017\Reference\Microsoft.AnalysisServices.Controls.DLL</HintPath>
       <Private>False</Private>
diff --git a/SQL2019_VS2017_BidsHelper.csproj b/SQL2019_VS2017_BidsHelper.csproj
@@ -841,11 +841,6 @@
       <HintPath>DLLs\SQL2019\Reference\Microsoft.SqlServer.ManagedDTS.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.AnalysisServices.AdomdClient, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>True</SpecificVersion>
-      <HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.AdomdClient.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.AnalysisServices.Controls">
       <HintPath>DLLs\SQL2019\Reference\Microsoft.AnalysisServices.Controls.DLL</HintPath>
       <Private>False</Private>
diff --git a/SSAS/AggManager/AggregationPerformance.cs b/SSAS/AggManager/AggregationPerformance.cs
@@ -1,8 +1,14 @@
-﻿using System;
+﻿#if SQL2017
+extern alias localAdomdClient;
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Microsoft.AnalysisServices;
-using Microsoft.AnalysisServices.AdomdClient;
 using System.Data;
 
 namespace AggManager
diff --git a/SSAS/AggManager/AggregationPerformanceProgress.cs b/SSAS/AggManager/AggregationPerformanceProgress.cs
@@ -30,6 +30,13 @@ PARTICULAR PURPOSE.
  * http://www.codeplex.com/MSFTASProdSamples                                   
  *                                                                             
  ============================================================================*/
+#if SQL2017
+extern alias localAdomdClient;
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -88,7 +95,7 @@ private void InitASSPLabel()
         {
             try
             {
-                Microsoft.AnalysisServices.AdomdClient.AdomdConnection conn = new Microsoft.AnalysisServices.AdomdClient.AdomdConnection("Data Source=" + lblServer.Text + ";Initial Catalog=" + lblDatabase.Text);
+                AdomdConnection conn = new AdomdConnection("Data Source=" + lblServer.Text + ";Initial Catalog=" + lblDatabase.Text);
                 conn.Open();
 
                 bool bASSPExists = AggManager.AggregationPerformanceTester.ASSPExists(conn);
@@ -305,7 +312,7 @@ private void chkTestAgg_CheckedChanged(object sender, EventArgs e)
 
         private void lnkASSP_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            System.Diagnostics.Process.Start("http://asstoredprocedures.codeplex.com/wikipage?title=FileSystemCache");
+            System.Diagnostics.Process.Start("https://asstoredprocedures.github.io/functions/FileSystemCache/");
         }
 
     }
diff --git a/SSAS/AggManager/EditAggs.cs b/SSAS/AggManager/EditAggs.cs
@@ -38,7 +38,7 @@ PARTICULAR PURPOSE.
 using System.Text;
 using System.Windows.Forms;
 using Microsoft.AnalysisServices;
-using Microsoft.AnalysisServices.AdomdClient;
+//using Microsoft.AnalysisServices.AdomdClient;
 
 
 namespace AggManager
diff --git a/SSAS/AggManager/frmDeleteUnusedAggs.cs b/SSAS/AggManager/frmDeleteUnusedAggs.cs
@@ -18,7 +18,7 @@
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using Microsoft.AnalysisServices.AdomdClient;
+//using Microsoft.AnalysisServices.AdomdClient;
 using Microsoft.AnalysisServices;
 using System.Data.SqlClient;
 
diff --git a/SSAS/AggManager/frmExportTable.cs b/SSAS/AggManager/frmExportTable.cs
@@ -20,7 +20,7 @@
 using System.Text;
 using System.Windows.Forms;
 using System.Data.SqlClient;
-using Microsoft.AnalysisServices.AdomdClient;
+//using Microsoft.AnalysisServices.AdomdClient;
 using Microsoft.AnalysisServices;
 
 
diff --git a/SSAS/AggManager/frmMain.cs b/SSAS/AggManager/frmMain.cs
@@ -40,7 +40,7 @@ PARTICULAR PURPOSE.
 using System.Globalization;
 using System.Reflection;
 
-using Microsoft.AnalysisServices.AdomdClient;
+//using Microsoft.AnalysisServices.AdomdClient;
 using Microsoft.AnalysisServices;
 
 namespace AggManager
diff --git a/SSAS/AggManager/frmPartitionsAggs.cs b/SSAS/AggManager/frmPartitionsAggs.cs
diff --git a/SSAS/AggManager/frmQueryLog.cs b/SSAS/AggManager/frmQueryLog.cs
@@ -37,7 +37,7 @@ PARTICULAR PURPOSE.
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using Microsoft.AnalysisServices.AdomdClient;
+//using Microsoft.AnalysisServices.AdomdClient;
 using Microsoft.AnalysisServices;
 using System.Data.SqlClient;
 
diff --git a/SSAS/DeleteUnusedIndexesForm.cs b/SSAS/DeleteUnusedIndexesForm.cs
@@ -1,11 +1,17 @@
+#if SQL2017
+extern alias localAdomdClient;
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using Microsoft.AnalysisServices.AdomdClient;
 using Microsoft.AnalysisServices;
 using System.Data.SqlClient;
 using System.ComponentModel.Design;
diff --git a/SSAS/DeployAggDesignsPlugin.cs b/SSAS/DeployAggDesignsPlugin.cs
@@ -1,3 +1,10 @@
+#if SQL2017
+extern alias localAdomdClient;
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
+
 using EnvDTE;
 using EnvDTE80;
 using System.Xml;
@@ -8,7 +15,6 @@
 using System.Resources;
 
 using Microsoft.AnalysisServices;
-using Microsoft.AnalysisServices.AdomdClient;
 using BIDSHelper.Core;
 using System;
 
diff --git a/SSAS/DeployMDXScriptPlugin.cs b/SSAS/DeployMDXScriptPlugin.cs
@@ -3,6 +3,12 @@
 //     Copyright (c) Company.  All rights reserved.
 // </copyright>
 //------------------------------------------------------------------------------
+#if SQL2017
+extern alias localAdomdClient;
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
 
 using System;
 using Microsoft.VisualStudio.Shell;
@@ -14,7 +20,6 @@
 using System.Text;
 using Microsoft.AnalysisServices;
 using EnvDTE80;
-using Microsoft.AnalysisServices.AdomdClient;
 using BIDSHelper.Core;
 using BIDSHelper.Core.VsIntegration;
 
diff --git a/SSAS/Tabular/TabularActionsEditorForm.cs b/SSAS/Tabular/TabularActionsEditorForm.cs
@@ -1,3 +1,7 @@
+#if SQL2017
+extern alias localAdomdClient;
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -7,12 +11,19 @@
 using System.Windows.Forms;
 using Microsoft.AnalysisServices;
 
+#if SQL2017
+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;
+#else
+using Microsoft.AnalysisServices.AdomdClient;
+#endif
+
+
 namespace BIDSHelper.SSAS
 {
     public partial class TabularActionsEditorForm : Form
     {
         private Microsoft.AnalysisServices.Cube cube;
-        private Microsoft.AnalysisServices.AdomdClient.AdomdConnection conn;
+        private AdomdConnection conn;
         private List<TabularActionsEditorPlugin.DrillthroughColumn> _listDrillthroughColumns;
         private List<ReportParameter> _listReportParameters;
         private List<Microsoft.AnalysisServices.Action> _listActionClones;
@@ -45,9 +56,9 @@ public Microsoft.AnalysisServices.Action[] Actions()
                 if (mg != null) //if this is a drillthrough action targeting a whole measure group, MeasureGroupMeasures doesn't actually return the calculated measures in a measure group, so we have to take this one drillthrough action and clone it for each measure under the covers
                 {
                     if (conn.State != ConnectionState.Open) conn.Open();
-                    Microsoft.AnalysisServices.AdomdClient.AdomdRestrictionCollection restrictions = new Microsoft.AnalysisServices.AdomdClient.AdomdRestrictionCollection();
-                    restrictions.Add(new Microsoft.AnalysisServices.AdomdClient.AdomdRestriction("CUBE_NAME", cube.Name));
-                    restrictions.Add(new Microsoft.AnalysisServices.AdomdClient.AdomdRestriction("MEASUREGROUP_NAME", mg.Name));
+                    AdomdRestrictionCollection restrictions = new AdomdRestrictionCollection();
+                    restrictions.Add(new AdomdRestriction("CUBE_NAME", cube.Name));
+                    restrictions.Add(new AdomdRestriction("MEASUREGROUP_NAME", mg.Name));
                     DataSet dataset = conn.GetSchemaDataSet("MDSCHEMA_MEASURES", restrictions);
                     int i = 0;
                     foreach (DataRow r in dataset.Tables[0].Rows)
@@ -113,7 +124,7 @@ public TabularActionsAnnotation Annotation
             get { return annotation; }
         }
 
-        public TabularActionsEditorForm(Microsoft.AnalysisServices.Cube cube, Microsoft.AnalysisServices.AdomdClient.AdomdConnection conn)
+        public TabularActionsEditorForm(Microsoft.AnalysisServices.Cube cube, AdomdConnection conn)
         {
             InitializeComponent();
             this.MinimumSize = this.Size;
@@ -330,14 +341,14 @@ private void dataGridView1_EditingControlShowing(object sender, DataGridViewEdit
             }
         }
 
-        private static List<string> GetRelatedTables(Dimension dMG, MeasureGroup mgOuter)
+        private static List<string> GetRelatedTables(Microsoft.AnalysisServices.Dimension dMG, MeasureGroup mgOuter)
         {
             List<string> list = new List<string>();
             foreach (Relationship relOuter in dMG.Relationships)
             {
                 bool bFound = false;
                 MeasureGroup mgFrom = dMG.Parent.Cubes[0].MeasureGroups[relOuter.FromRelationshipEnd.DimensionID];
-                Dimension dTo = dMG.Parent.Dimensions[relOuter.ToRelationshipEnd.DimensionID];
+                Microsoft.AnalysisServices.Dimension dTo = dMG.Parent.Dimensions[relOuter.ToRelationshipEnd.DimensionID];
                 CubeDimension dToCube = dMG.Parent.Cubes[0].Dimensions[relOuter.ToRelationshipEnd.DimensionID];
                 foreach (MeasureGroupDimension mgdOuter in mgFrom.Dimensions)
                 {
@@ -922,7 +933,7 @@ private void cmbTargetType_SelectedIndexChanged(object sender, EventArgs e)
                     {
                         cmbTarget.Items.Add(string.Format("[" + cd.Name + "].[" + a.Name + "]"));
                     }
-                    foreach (Hierarchy a in cd.Dimension.Hierarchies)
+                    foreach (Microsoft.AnalysisServices.Hierarchy a in cd.Dimension.Hierarchies)
                     {
                         cmbTarget.Items.Add(string.Format("[" + cd.Name + "].[" + a.Name + "]"));
                     }
@@ -934,9 +945,9 @@ private void cmbTargetType_SelectedIndexChanged(object sender, EventArgs e)
                 cmbTarget.Items.Add(string.Format("[Measures].[MeasuresLevel]"));
                 foreach (CubeDimension cd in cube.Dimensions)
                 {
-                    foreach (Hierarchy a in cd.Dimension.Hierarchies)
+                    foreach (Microsoft.AnalysisServices.Hierarchy a in cd.Dimension.Hierarchies)
                     {
-                        foreach (Level l in a.Levels)
+                        foreach (Microsoft.AnalysisServices.Level l in a.Levels)
                         {
                             cmbTarget.Items.Add(string.Format("[" + cd.Name + "].[" + a.Name + "].[" + l.Name + "]"));
                         }
@@ -950,7 +961,7 @@ private void linkHelp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e
         {
             try
             {
-                System.Diagnostics.Process.Start("http://bidshelper.codeplex.com/wikipage?title=Tabular%20Actions%20Editor");
+                System.Diagnostics.Process.Start("https://bideveloperextensions.github.io/features/TabularActionsEditor/");
             }
             catch (Exception ex)
             {
@@ -1122,7 +1133,7 @@ private void btnTestMDX_Click(object sender, EventArgs e)
             {
                 SaveAction();
 
-                Microsoft.AnalysisServices.AdomdClient.AdomdCommand cmd = new Microsoft.AnalysisServices.AdomdClient.AdomdCommand();
+                AdomdCommand cmd = new AdomdCommand();
                 cmd.CommandTimeout = 0;
                 cmd.Connection = conn;
                 if (conn.State != ConnectionState.Open) conn.Open();
@@ -1170,7 +1181,7 @@ private void btnTestMDX_Click(object sender, EventArgs e)
                     cmd.CommandText = sb.ToString();
                     try
                     {
-                        Microsoft.AnalysisServices.AdomdClient.CellSet cs = cmd.ExecuteCellSet();
+                        CellSet cs = cmd.ExecuteCellSet();
                         sbResult.AppendLine(sKey + ": " + Convert.ToString(cs.Cells[0].Value));
                     }
                     catch (Exception exMDX)
diff --git a/SSAS/Tabular/TabularActionsEditorPlugin.cs b/SSAS/Tabular/TabularActionsEditorPlugin.cs
@@ -102,10 +102,14 @@ private void ExecSandbox(Microsoft.AnalysisServices.BackEnd.DataModelingSandbox
             try
             {
 
-                
+
 #if DENALI || SQL2014
                 var sb = sandboxParam;
                 var conn = sandboxParam.AdomdConnection;
+#elif SQL2017
+                var sb = (Microsoft.AnalysisServices.BackEnd.DataModelingSandboxAmo)sandboxParam.Impl;
+                var localConn = sandboxParam.AdomdConnection;
+                var conn = new localAdomdClient.Microsoft.AnalysisServices.AdomdClient.AdomdConnection(localConn.ConnectionString);
 #else
                 var sb = (Microsoft.AnalysisServices.BackEnd.DataModelingSandboxAmo)sandboxParam.Impl;
                 var localConn = sandboxParam.AdomdConnection;
diff --git a/extension2017.vsixmanifest b/extension2017.vsixmanifest
@@ -1,6 +1,6 @@
 ﻿<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
   <Metadata>
-    <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.2.0" Language="en-US" Publisher="bideveloperextensions.github.io" />
+    <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.2.1" Language="en-US" Publisher="bideveloperextensions.github.io" />
     <DisplayName>BI Developer Extensions for Visual Studio 2017</DisplayName>
     <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects.</Description>
     <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class VersionInfo`
`9`	`9`	`{`
`10`	`10`	`// BIDS Helper Assembly & VSIX Version`
`11`	`11`	`// N.B. Manually update the manifest file, if you change this - See source.extension.vsixmanifest`
`12`		`- public const string Version = "2.2.0";`
	`12`	`+ public const string Version = "2.2.1";`
`13`	`13`
`14`	`14`	`private static readonly object lockResource = new object();`
`15`	`15`	`private static Version visualStudioVersion;`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,13 @@ PARTICULAR PURPOSE.`
`30`	`30`	`* http://www.codeplex.com/MSFTASProdSamples`
`31`	`31`	`*`
`32`	`32`	`============================================================================*/`
	`33`	`+#if SQL2017`
	`34`	`+extern alias localAdomdClient;`
	`35`	`+using localAdomdClient.Microsoft.AnalysisServices.AdomdClient;`
	`36`	`+#else`
	`37`	`+using Microsoft.AnalysisServices.AdomdClient;`
	`38`	`+#endif`
	`39`	`+`
`33`	`40`	`using System;`
`34`	`41`	`using System.Collections.Generic;`
`35`	`42`	`using System.ComponentModel;`
`@@ -88,7 +95,7 @@ private void InitASSPLabel()`
`88`	`95`	`{`
`89`	`96`	`try`
`90`	`97`	`{`
`91`		`- Microsoft.AnalysisServices.AdomdClient.AdomdConnection conn = new Microsoft.AnalysisServices.AdomdClient.AdomdConnection("Data Source=" + lblServer.Text + ";Initial Catalog=" + lblDatabase.Text);`
	`98`	`+ AdomdConnection conn = new AdomdConnection("Data Source=" + lblServer.Text + ";Initial Catalog=" + lblDatabase.Text);`
`92`	`99`	`conn.Open();`
`93`	`100`
`94`	`101`	`bool bASSPExists = AggManager.AggregationPerformanceTester.ASSPExists(conn);`
`@@ -305,7 +312,7 @@ private void chkTestAgg_CheckedChanged(object sender, EventArgs e)`
`305`	`312`
`306`	`313`	`private void lnkASSP_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)`
`307`	`314`	`{`
`308`		`- System.Diagnostics.Process.Start("http://asstoredprocedures.codeplex.com/wikipage?title=FileSystemCache");`
	`315`	`+ System.Diagnostics.Process.Start("https://asstoredprocedures.github.io/functions/FileSystemCache/");`
`309`	`316`	`}`
`310`	`317`
`311`	`318`	`}`