Skip to content

Commit eec0bdb

Browse files
marcosqlbimarcosqlbi
committed
Updated icon.
Fixed connection to enable CUBEVALUE / CUBEMEMBER
1 parent 264aa79 commit eec0bdb

7 files changed

Lines changed: 36 additions & 19 deletions

File tree

‎AnalyzeInExcel/AnalyzeInExcel.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<ApplicationIcon>icon-2400px.ico</ApplicationIcon>
6565
</PropertyGroup>
6666
<ItemGroup>
67-
<Reference Include="AutoUpdater.NET, Version=1.6.0.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Autoupdater.NET.Official.1.6.0\lib\net40\AutoUpdater.NET.dll</HintPath>
67+
<Reference Include="AutoUpdater.NET, Version=1.6.3.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Autoupdater.NET.Official.1.6.3\lib\net45\AutoUpdater.NET.dll</HintPath>
6969
</Reference>
7070
<Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
7171
<HintPath>..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll</HintPath>
@@ -88,19 +88,18 @@
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="System.Data" />
91-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
92-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
93-
<Private>True</Private>
91+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
92+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
9493
</Reference>
9594
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
9695
<HintPath>..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll</HintPath>
9796
<Private>True</Private>
9897
</Reference>
9998
<Reference Include="System.Net.Http" />
100-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
102-
<Private>True</Private>
99+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
103101
</Reference>
102+
<Reference Include="System.Runtime.Serialization" />
104103
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
105104
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
106105
</Reference>

‎AnalyzeInExcel/ExcelHelper.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ public static bool CreateInstanceWithPivotTableViaInterop(string serverName, str
5757
var workbook = app.Workbooks.Add();
5858

5959
// Create the connection
60-
var workbookConnection = workbook.Connections.Add(
60+
var workbookConnection = workbook.Connections.Add2(
6161
Name: connectionName,
6262
Description: "",
6363
ConnectionString: $"OLEDB;{ connectionString }",
6464
CommandText: commandText,
6565
lCmdtype: 1
6666
);
67+
workbookConnection.OLEDBConnection.MaintainConnection = true;
6768

6869
// Create the pivotcache
6970
var pivotCache = workbook.PivotCaches().Create(
@@ -119,13 +120,14 @@ public static bool CreateInstanceWithPivotTableViaDispatch(string serverName, st
119120
dynamic workbook = app.Workbooks.Add();
120121

121122
// Create the connection
122-
dynamic workbookConnection = workbook.Connections.Add(
123+
dynamic workbookConnection = workbook.Connections.Add2(
123124
Name: connectionName,
124125
Description: "",
125126
ConnectionString: $"OLEDB;{ connectionString }",
126127
CommandText: commandText,
127128
lCmdtype: 1
128129
);
130+
workbookConnection.OLEDBConnection.MaintainConnection = true;
129131

130132
// Create the pivotcache
131133
dynamic pivotCache = workbook.PivotCaches().Create(

‎AnalyzeInExcel/app.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
1212
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
1313
</dependentAssembly>
14+
<dependentAssembly>
15+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
17+
</dependentAssembly>
18+
<dependentAssembly>
19+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
21+
</dependentAssembly>
1422
</assemblyBinding>
1523
</runtime>
1624
</configuration>

‎AnalyzeInExcel/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autoupdater.NET.Official" version="1.6.0" targetFramework="net45" />
3+
<package id="Autoupdater.NET.Official" version="1.6.3" targetFramework="net45" />
44
<package id="CommandLineParser" version="2.8.0" targetFramework="net45" />
55
<package id="Costura.Fody" version="3.3.3" targetFramework="net45" />
66
<package id="Fody" version="4.2.1" targetFramework="net45" developmentDependency="true" />
77
<package id="Microsoft.ApplicationInsights" version="2.14.0" targetFramework="net45" />
88
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net45" />
99
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
10-
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net45" />
10+
<package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net45" />
1111
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
12-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net45" />
12+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1313
<package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
1414
</packages>

‎ExternalToolsInstaller/ExternalToolsInstaller.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
</Reference>
5959
<Reference Include="System.Configuration.Install" />
6060
<Reference Include="System.Core" />
61-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
61+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Management" />
6565
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
6666
<HintPath>..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll</HintPath>
6767
</Reference>
68-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
68+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System.Xml.Linq" />
7272
<Reference Include="System.Data.DataSetExtensions" />

‎ExternalToolsInstaller/app.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
1212
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
20+
</dependentAssembly>
1321
</assemblyBinding>
1422
</runtime>
1523
</configuration>

‎ExternalToolsInstaller/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.ApplicationInsights" version="2.14.0" targetFramework="net45" />
66
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net45" />
8-
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net45" />
8+
<package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net45" />
99
<package id="System.Memory" version="4.5.4" targetFramework="net45" />
10-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net45" />
10+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net45" />
1111
</packages>

0 commit comments

Comments
 (0)