Fixes for hybrid tables and PBIT serialization
This commit is contained in:
parent
4961da85fe
commit
8e9a26c798
@ -46,20 +46,23 @@
|
|||||||
<ApplicationIcon>BismNorm.ico</ApplicationIcon>
|
<ApplicationIcon>BismNorm.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.AnalysisServices, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Microsoft.Identity.Client, Version=4.43.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||||
@ -69,6 +72,7 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.IdentityModel" />
|
||||||
<Reference Include="System.Windows.Forms.Ribbon, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="System.Windows.Forms.Ribbon, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>.\System.Windows.Forms.Ribbon.dll</HintPath>
|
<HintPath>.\System.Windows.Forms.Ribbon.dll</HintPath>
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("5.0.32.0")]
|
[assembly: AssemblyVersion("5.0.33.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.32.0")]
|
[assembly: AssemblyFileVersion("5.0.33.0")]
|
||||||
|
@ -4,7 +4,8 @@
|
|||||||
<package id="cef.redist.x86" version="3.3239.1723" targetFramework="net461" />
|
<package id="cef.redist.x86" version="3.3239.1723" targetFramework="net461" />
|
||||||
<package id="CefSharp.Common" version="63.0.3" targetFramework="net461" />
|
<package id="CefSharp.Common" version="63.0.3" targetFramework="net461" />
|
||||||
<package id="CefSharp.WinForms" version="63.0.3" targetFramework="net461" />
|
<package id="CefSharp.WinForms" version="63.0.3" targetFramework="net461" />
|
||||||
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.39.2.2" targetFramework="net472" />
|
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.51.0" targetFramework="net472" />
|
||||||
|
<package id="Microsoft.Identity.Client" version="4.43.0" targetFramework="net472" />
|
||||||
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
|
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
|
||||||
<package id="Octokit" version="0.36.0" targetFramework="net472" />
|
<package id="Octokit" version="0.36.0" targetFramework="net472" />
|
||||||
</packages>
|
</packages>
|
@ -2842,7 +2842,7 @@
|
|||||||
{
|
{
|
||||||
"Name" = "8:.NET Framework"
|
"Name" = "8:.NET Framework"
|
||||||
"Message" = "8:[VSDNETMSG]"
|
"Message" = "8:[VSDNETMSG]"
|
||||||
"FrameworkVersion" = "8:v4.6.1 "
|
"FrameworkVersion" = "8:v4.6.1 "
|
||||||
"AllowLaterVersions" = "11:FALSE"
|
"AllowLaterVersions" = "11:FALSE"
|
||||||
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
|
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
|
||||||
}
|
}
|
||||||
@ -2854,7 +2854,7 @@
|
|||||||
{
|
{
|
||||||
"AssemblyRegister" = "3:1"
|
"AssemblyRegister" = "3:1"
|
||||||
"AssemblyIsInGAC" = "11:FALSE"
|
"AssemblyIsInGAC" = "11:FALSE"
|
||||||
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.31.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
|
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.32.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
|
||||||
"ScatterAssemblies"
|
"ScatterAssemblies"
|
||||||
{
|
{
|
||||||
"_0020EC0A2900F50F0F5DCC3E7BBE4237"
|
"_0020EC0A2900F50F0F5DCC3E7BBE4237"
|
||||||
@ -3791,7 +3791,7 @@
|
|||||||
{
|
{
|
||||||
"AssemblyRegister" = "3:1"
|
"AssemblyRegister" = "3:1"
|
||||||
"AssemblyIsInGAC" = "11:FALSE"
|
"AssemblyIsInGAC" = "11:FALSE"
|
||||||
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.31.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
|
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.32.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
|
||||||
"ScatterAssemblies"
|
"ScatterAssemblies"
|
||||||
{
|
{
|
||||||
"_1F23AE629378259BAD7F2BCAB42727AD"
|
"_1F23AE629378259BAD7F2BCAB42727AD"
|
||||||
@ -9288,15 +9288,15 @@
|
|||||||
{
|
{
|
||||||
"Name" = "8:Microsoft Visual Studio"
|
"Name" = "8:Microsoft Visual Studio"
|
||||||
"ProductName" = "8:Power BI ALM Toolkit"
|
"ProductName" = "8:Power BI ALM Toolkit"
|
||||||
"ProductCode" = "8:{FDC7726C-CE6B-4CED-B829-FAFF1CE015D9}"
|
"ProductCode" = "8:{E2D47781-E7AC-4976-BCED-AFF8ADF5046E}"
|
||||||
"PackageCode" = "8:{88420696-968D-4162-B22F-DD0F878E4A82}"
|
"PackageCode" = "8:{89D0ECEB-4D5F-4E60-AEEC-BDF22045036E}"
|
||||||
"UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}"
|
"UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}"
|
||||||
"AspNetVersion" = "8:4.0.30319.0"
|
"AspNetVersion" = "8:4.0.30319.0"
|
||||||
"RestartWWWService" = "11:FALSE"
|
"RestartWWWService" = "11:FALSE"
|
||||||
"RemovePreviousVersions" = "11:TRUE"
|
"RemovePreviousVersions" = "11:TRUE"
|
||||||
"DetectNewerInstalledVersion" = "11:TRUE"
|
"DetectNewerInstalledVersion" = "11:TRUE"
|
||||||
"InstallAllUsers" = "11:TRUE"
|
"InstallAllUsers" = "11:TRUE"
|
||||||
"ProductVersion" = "8:5.0.32"
|
"ProductVersion" = "8:5.0.33"
|
||||||
"Manufacturer" = "8:Power BI ALM Toolkit"
|
"Manufacturer" = "8:Power BI ALM Toolkit"
|
||||||
"ARPHELPTELEPHONE" = "8:"
|
"ARPHELPTELEPHONE" = "8:"
|
||||||
"ARPHELPLINK" = "8:"
|
"ARPHELPLINK" = "8:"
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("5.0.32.0")]
|
[assembly: AssemblyVersion("5.0.33.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.32.0")]
|
[assembly: AssemblyFileVersion("5.0.33.0")]
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("5.0.32.0")]
|
[assembly: AssemblyVersion("5.0.33.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.32.0")]
|
[assembly: AssemblyFileVersion("5.0.33.0")]
|
||||||
|
@ -40,22 +40,34 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.AnalysisServices, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
<Reference Include="Microsoft.Identity.Client, Version=4.43.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
|
<Reference Include="System.Drawing" />
|
||||||
|
<Reference Include="System.IdentityModel" />
|
||||||
|
<Reference Include="System.Net.Http" />
|
||||||
|
<Reference Include="System.Windows.Forms" />
|
||||||
|
<Reference Include="System.Xml" />
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Choose>
|
<Choose>
|
||||||
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
|
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.39.2.2" targetFramework="net472" />
|
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.51.0" targetFramework="net472" />
|
||||||
|
<package id="Microsoft.Identity.Client" version="4.43.0" targetFramework="net472" />
|
||||||
</packages>
|
</packages>
|
Binary file not shown.
@ -101,25 +101,28 @@
|
|||||||
<Reference Include="Microsoft.AI.WindowsServer, Version=2.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AI.WindowsServer, Version=2.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.ApplicationInsights.WindowsServer.2.8.1\lib\net45\Microsoft.AI.WindowsServer.dll</HintPath>
|
<HintPath>..\packages\Microsoft.ApplicationInsights.WindowsServer.2.8.1\lib\net45\Microsoft.AI.WindowsServer.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Core, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.AnalysisServices.Tabular.Json, Version=19.51.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.ApplicationInsights, Version=2.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.ApplicationInsights, Version=2.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
|
<HintPath>..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
<Reference Include="Microsoft.Identity.Client, Version=4.43.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
|
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||||
@ -204,12 +207,14 @@
|
|||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="System.Design" />
|
<Reference Include="System.Design" />
|
||||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.DirectoryServices.AccountManagement" />
|
<Reference Include="System.DirectoryServices.AccountManagement" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
<Reference Include="System.IdentityModel" />
|
||||||
<Reference Include="System.IO.Compression" />
|
<Reference Include="System.IO.Compression" />
|
||||||
<Reference Include="System.Management" />
|
<Reference Include="System.Management" />
|
||||||
<Reference Include="System.Net.Http" />
|
<Reference Include="System.Net.Http" />
|
||||||
@ -220,6 +225,7 @@
|
|||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
<Reference Include="System.Xaml" />
|
<Reference Include="System.Xaml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
Binary file not shown.
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("5.0.32.0")]
|
[assembly: AssemblyVersion("5.0.33.0")]
|
||||||
[assembly: AssemblyFileVersion("5.0.32.0")]
|
[assembly: AssemblyFileVersion("5.0.33.0")]
|
||||||
|
@ -276,6 +276,11 @@ namespace BismNormalizer.TabularCompare
|
|||||||
set { _workspaceServer = value; }
|
set { _workspaceServer = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsPbit()
|
||||||
|
{
|
||||||
|
return (!String.IsNullOrEmpty(_bimFile) && _bimFile.ToUpper().EndsWith(".PBIT"));
|
||||||
|
}
|
||||||
|
|
||||||
private void ReadSettingsFile()
|
private void ReadSettingsFile()
|
||||||
{
|
{
|
||||||
FileInfo[] files = _projectDirectoryInfo.GetFiles("*.settings", SearchOption.TopDirectoryOnly);
|
FileInfo[] files = _projectDirectoryInfo.GetFiles("*.settings", SearchOption.TopDirectoryOnly);
|
||||||
@ -709,16 +714,17 @@ $@"{{
|
|||||||
{
|
{
|
||||||
TOM.Database tomDatabase;
|
TOM.Database tomDatabase;
|
||||||
string modelJson;
|
string modelJson;
|
||||||
if (_bimFile.ToUpper().EndsWith(".PBIT"))
|
if (this.IsPbit())
|
||||||
{
|
{
|
||||||
PowerBiTemplate pbit = new PowerBiTemplate(_bimFile);
|
PowerBiTemplate pbit = new PowerBiTemplate(_bimFile);
|
||||||
modelJson = pbit.ModelJson;
|
modelJson = pbit.ModelJson;
|
||||||
|
tomDatabase = TOM.JsonSerializer.DeserializeDatabase(modelJson, null, CompatibilityMode.PowerBI);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
modelJson = File.ReadAllText(_bimFile);
|
modelJson = File.ReadAllText(_bimFile);
|
||||||
|
tomDatabase = TOM.JsonSerializer.DeserializeDatabase(modelJson);
|
||||||
}
|
}
|
||||||
tomDatabase = TOM.JsonSerializer.DeserializeDatabase(modelJson);
|
|
||||||
return tomDatabase;
|
return tomDatabase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1917,7 +1917,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
|
|||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
(_targetTabularModel.ConnectionInfo.UseDesktop && _targetTabularModel.ConnectionInfo.ServerMode == Microsoft.AnalysisServices.ServerMode.SharePoint) ||
|
(_targetTabularModel.ConnectionInfo.UseDesktop && _targetTabularModel.ConnectionInfo.ServerMode == Microsoft.AnalysisServices.ServerMode.SharePoint) ||
|
||||||
(_targetTabularModel.ConnectionInfo.UseBimFile && _targetTabularModel.ConnectionInfo.BimFile != null && _targetTabularModel.ConnectionInfo.BimFile.ToUpper().EndsWith(".PBIT"))
|
(_targetTabularModel.ConnectionInfo.UseBimFile && _targetTabularModel.ConnectionInfo.BimFile != null && _targetTabularModel.ConnectionInfo.IsPbit())
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
//V3 hardening
|
//V3 hardening
|
||||||
|
@ -2031,7 +2031,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
|
|||||||
|
|
||||||
//serialize db to json
|
//serialize db to json
|
||||||
SerializeOptions options = new SerializeOptions();
|
SerializeOptions options = new SerializeOptions();
|
||||||
bool isPbit = (_connectionInfo.UseBimFile && _connectionInfo.BimFile.ToUpper().EndsWith(".PBIT"));
|
bool isPbit = (_connectionInfo.UseBimFile && _connectionInfo.IsPbit());
|
||||||
|
|
||||||
if (isPbit)
|
if (isPbit)
|
||||||
{
|
{
|
||||||
|
@ -35,7 +35,15 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
|
|||||||
options.IgnoreInferredObjects = true;
|
options.IgnoreInferredObjects = true;
|
||||||
options.IgnoreTimestamps = true;
|
options.IgnoreTimestamps = true;
|
||||||
options.SplitMultilineStrings = true;
|
options.SplitMultilineStrings = true;
|
||||||
_objectDefinition = Tom.JsonSerializer.SerializeObject(namedMetaDataObject, options);
|
|
||||||
|
if (parentTabularModel.ConnectionInfo.IsPbit())
|
||||||
|
{
|
||||||
|
_objectDefinition = Tom.JsonSerializer.SerializeObject(namedMetaDataObject, options, parentTabularModel.ConnectionInfo.CompatibilityLevel, Microsoft.AnalysisServices.CompatibilityMode.PowerBI);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_objectDefinition = Tom.JsonSerializer.SerializeObject(namedMetaDataObject, options);
|
||||||
|
}
|
||||||
|
|
||||||
//Remove annotations
|
//Remove annotations
|
||||||
{
|
{
|
||||||
|
@ -2,13 +2,14 @@
|
|||||||
<packages>
|
<packages>
|
||||||
<package id="EnvDTE" version="8.0.2" targetFramework="net472" />
|
<package id="EnvDTE" version="8.0.2" targetFramework="net472" />
|
||||||
<package id="EnvDTE80" version="8.0.3" targetFramework="net472" />
|
<package id="EnvDTE80" version="8.0.3" targetFramework="net472" />
|
||||||
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.39.2.2" targetFramework="net472" />
|
<package id="Microsoft.AnalysisServices.retail.amd64" version="19.51.0" targetFramework="net472" />
|
||||||
<package id="Microsoft.ApplicationInsights" version="2.8.1" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights" version="2.8.1" targetFramework="net461" />
|
||||||
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.4.0" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.4.0" targetFramework="net461" />
|
||||||
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.8.1" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.8.1" targetFramework="net461" />
|
||||||
<package id="Microsoft.ApplicationInsights.PerfCounterCollector" version="2.8.1" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights.PerfCounterCollector" version="2.8.1" targetFramework="net461" />
|
||||||
<package id="Microsoft.ApplicationInsights.WindowsServer" version="2.8.1" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights.WindowsServer" version="2.8.1" targetFramework="net461" />
|
||||||
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.8.1" targetFramework="net461" />
|
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.8.1" targetFramework="net461" />
|
||||||
|
<package id="Microsoft.Identity.Client" version="4.43.0" targetFramework="net472" />
|
||||||
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" />
|
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" />
|
||||||
<package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net461" />
|
<package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net461" />
|
||||||
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
|
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net461" />
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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">
|
<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>
|
<Metadata>
|
||||||
<Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.32.0" Language="en-US" Publisher="BISM Normalizer" />
|
<Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.33.0" Language="en-US" Publisher="BISM Normalizer" />
|
||||||
<DisplayName>BISM Normalizer</DisplayName>
|
<DisplayName>BISM Normalizer</DisplayName>
|
||||||
<Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
|
<Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
|
||||||
<MoreInfo>http://bism-normalizer.com/</MoreInfo>
|
<MoreInfo>http://bism-normalizer.com/</MoreInfo>
|
||||||
|
Loading…
Reference in New Issue
Block a user