Fixes #272 VPA errors on tables with single quotes in name

DaxStudio · Jan 8, 2020 · 708738d · 708738d
1 parent cc1e564
commit 708738d
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 34 deletions.
diff --git a/src/DAXEditor/DAXEditor.csproj b/src/DAXEditor/DAXEditor.csproj
@@ -85,8 +85,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.AvalonEdit.CodeCompletion, Version=1.33.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SharpDevelopCodeCompletion.1.33.2.0\lib\ICSharpCode.AvalonEdit.CodeCompletion.dll</HintPath>

diff --git a/src/DAXEditor/packages.config b/src/DAXEditor/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="6.0.0" targetFramework="net45" />
+  <package id="AvalonEdit" version="6.0.1" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.8" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.8" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.CodeQuality.Analyzers" version="2.9.8" targetFramework="net45" developmentDependency="true" />

diff --git a/src/DaxStudio.Standalone/app.config b/src/DaxStudio.Standalone/app.config
@@ -17,7 +17,7 @@
       <probing privatePath="bin" />
       <dependentAssembly>
         <assemblyIdentity name="ICSharpCode.AvalonEdit" publicKeyToken="9cc39be672370310" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.278" newVersion="6.0.1.278" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Windows.Interactivity" PublicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/src/DaxStudio.UI/DaxStudio.UI.csproj b/src/DaxStudio.UI/DaxStudio.UI.csproj
@@ -182,28 +182,28 @@
       <HintPath>..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="ControlzEx, Version=4.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ControlzEx.4.1.0\lib\net462\ControlzEx.dll</HintPath>
+      <HintPath>..\..\packages\ControlzEx.4.2.0\lib\net462\ControlzEx.dll</HintPath>
     </Reference>
     <Reference Include="CsvHelper, Version=12.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CsvHelper.12.2.1\lib\net47\CsvHelper.dll</HintPath>
+      <HintPath>..\..\packages\CsvHelper.12.2.3\lib\net47\CsvHelper.dll</HintPath>
     </Reference>
-    <Reference Include="Dax.Metadata, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dax.Metadata.1.0.14\lib\netstandard2.0\Dax.Metadata.dll</HintPath>
+    <Reference Include="Dax.Metadata, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dax.Metadata.1.0.16\lib\netstandard2.0\Dax.Metadata.dll</HintPath>
     </Reference>
-    <Reference Include="Dax.Model.Extractor, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dax.Model.Extractor.1.0.14\lib\net471\Dax.Model.Extractor.dll</HintPath>
+    <Reference Include="Dax.Model.Extractor, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dax.Model.Extractor.1.0.16\lib\net471\Dax.Model.Extractor.dll</HintPath>
     </Reference>
-    <Reference Include="Dax.ViewModel, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dax.ViewModel.1.0.14\lib\netstandard2.0\Dax.ViewModel.dll</HintPath>
+    <Reference Include="Dax.ViewModel, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dax.ViewModel.1.0.16\lib\netstandard2.0\Dax.ViewModel.dll</HintPath>
     </Reference>
-    <Reference Include="Dax.ViewVpaExport, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dax.ViewVpaExport.1.0.14\lib\netstandard2.0\Dax.ViewVpaExport.dll</HintPath>
+    <Reference Include="Dax.ViewVpaExport, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dax.ViewVpaExport.1.0.16\lib\netstandard2.0\Dax.ViewVpaExport.dll</HintPath>
     </Reference>
-    <Reference Include="Dax.Vpax, Version=1.0.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dax.Vpax.1.0.14\lib\net471\Dax.Vpax.dll</HintPath>
+    <Reference Include="Dax.Vpax, Version=1.0.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Dax.Vpax.1.0.16\lib\net471\Dax.Vpax.dll</HintPath>
     </Reference>
     <Reference Include="Fluent, Version=7.0.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Fluent.Ribbon.7.0.0\lib\net462\Fluent.dll</HintPath>
+      <HintPath>..\..\packages\Fluent.Ribbon.7.0.1\lib\net462\Fluent.dll</HintPath>
     </Reference>
     <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL">
       <HintPath>..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
@@ -214,8 +214,8 @@
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AnalysisServices, Version=18.2.3.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AnalysisServices.retail.amd64.18.2.3\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
@@ -535,6 +535,7 @@
     <Compile Include="Utils\JsonSettingProviderPortable.cs" />
     <Compile Include="Utils\ManagedIpHelper.cs" />
     <Compile Include="Utils\OdcHelper.cs" />
+    <Compile Include="Utils\OneDriveHelper.cs" />
     <Compile Include="Utils\ParameterHelper.cs" />
     <Compile Include="Utils\ScreenUnitsHelper.cs" />
     <Compile Include="Utils\SendKeys.cs" />
@@ -570,6 +571,7 @@
     <Compile Include="Utils\PaneStyleSelector.cs" />
     <Compile Include="Utils\PowerBIHelper.cs" />
     <Compile Include="Extensions\TraceWatcherCollectionExtensions.cs" />
+    <Compile Include="Utils\UserHelper.cs" />
     <Compile Include="Utils\WrapSharingViolations.cs" />
     <Compile Include="Validation\BindingProxy.cs" />
     <Compile Include="Validation\HotkeyValidationRule.cs" />

diff --git a/src/DaxStudio.UI/app.config b/src/DaxStudio.UI/app.config
@@ -19,7 +19,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="ICSharpCode.AvalonEdit" publicKeyToken="9cc39be672370310" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.278" newVersion="6.0.1.278" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ControlzEx" PublicKeyToken="null" culture="neutral" />

diff --git a/src/DaxStudio.UI/packages.config b/src/DaxStudio.UI/packages.config
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="6.0.0" targetFramework="net471" />
+  <package id="AvalonEdit" version="6.0.1" targetFramework="net471" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net471" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net471" />
-  <package id="ControlzEx" version="4.1.0" targetFramework="net471" />
-  <package id="CsvHelper" version="12.2.1" targetFramework="net471" />
-  <package id="Dax.Metadata" version="1.0.14" targetFramework="net471" />
-  <package id="Dax.Model.Extractor" version="1.0.14" targetFramework="net471" />
-  <package id="Dax.ViewModel" version="1.0.14" targetFramework="net471" />
-  <package id="Dax.ViewVpaExport" version="1.0.14" targetFramework="net471" />
-  <package id="Dax.Vpax" version="1.0.14" targetFramework="net471" />
+  <package id="ControlzEx" version="4.2.0" targetFramework="net471" />
+  <package id="CsvHelper" version="12.2.3" targetFramework="net471" />
+  <package id="Dax.Metadata" version="1.0.16" targetFramework="net471" />
+  <package id="Dax.Model.Extractor" version="1.0.16" targetFramework="net471" />
+  <package id="Dax.ViewModel" version="1.0.16" targetFramework="net471" />
+  <package id="Dax.ViewVpaExport" version="1.0.16" targetFramework="net471" />
+  <package id="Dax.Vpax" version="1.0.16" targetFramework="net471" />
   <package id="Dirkster.AvalonDock" version="3.5.12" targetFramework="net471" />
   <package id="Dirkster.MWindowDialogLib" version="1.1.0.2" targetFramework="net471" />
   <package id="Dirkster.NumericUpDownLib" version="2.4.0" targetFramework="net471" />
   <package id="Dirkster.WatermarkControlsLib" version="1.1.0" targetFramework="net471" />
-  <package id="Fluent.Ribbon" version="7.0.0" targetFramework="net471" />
+  <package id="Fluent.Ribbon" version="7.0.1" targetFramework="net471" />
   <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net471" />
   <package id="gong-wpf-dragdrop" version="2.1.0" targetFramework="net471" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net471" />
@@ -31,5 +31,5 @@
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.3" targetFramework="net471" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net471" />
   <package id="Serilog" version="2.9.0" targetFramework="net471" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" /> 
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
 </packages>
diff --git a/tests/DaxStudio.Tests/DaxStudio.Tests.csproj b/tests/DaxStudio.Tests/DaxStudio.Tests.csproj
@@ -54,8 +54,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.AvalonEdit.CodeCompletion, Version=1.33.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SharpDevelopCodeCompletion.1.33.2.0\lib\ICSharpCode.AvalonEdit.CodeCompletion.dll</HintPath>
@@ -127,6 +127,7 @@
     <Compile Include="Mocks\MockInsightProvider.cs" />
     <Compile Include="Mocks\MockWindowManager.cs" />
     <Compile Include="OleDbTests.cs" />
+    <Compile Include="OneDriveHelperTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ADOTabularTests.cs" />
     <Compile Include="DaxParameterTests.cs" />

diff --git a/tests/DaxStudio.Tests/app.config b/tests/DaxStudio.Tests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="ICSharpCode.AvalonEdit" publicKeyToken="9cc39be672370310" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.278" newVersion="6.0.1.278" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/tests/DaxStudio.Tests/packages.config b/tests/DaxStudio.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="6.0.0" targetFramework="net471" />
+  <package id="AvalonEdit" version="6.0.1" targetFramework="net471" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net45" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net45" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net45" />