This commit is contained in:
Christian Wade 2020-10-19 20:29:41 -07:00
parent ae3f6ab000
commit 2e038da791
8 changed files with 12 additions and 15 deletions

View File

@ -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.12.0")] [assembly: AssemblyVersion("5.0.12.1")]
[assembly: AssemblyFileVersion("5.0.12.0")] [assembly: AssemblyFileVersion("5.0.12.1")]

View File

@ -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.12.0")] [assembly: AssemblyVersion("5.0.12.1")]
[assembly: AssemblyFileVersion("5.0.12.0")] [assembly: AssemblyFileVersion("5.0.12.1")]

View File

@ -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.12.0")] [assembly: AssemblyVersion("5.0.12.1")]
[assembly: AssemblyFileVersion("5.0.12.0")] [assembly: AssemblyFileVersion("5.0.12.1")]

View File

@ -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.12.0")] [assembly: AssemblyVersion("5.0.12.1")]
[assembly: AssemblyFileVersion("5.0.12.0")] [assembly: AssemblyFileVersion("5.0.12.1")]

View File

@ -1823,8 +1823,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
private void DeleteCalculationItem(ComparisonObject comparisonObject, string tableName) private void DeleteCalculationItem(ComparisonObject comparisonObject, string tableName)
{ {
if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Delete)
comparisonObject.MergeAction == MergeAction.Delete)
{ {
Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName);
if (tableTarget != null) if (tableTarget != null)
@ -1843,8 +1842,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
private void CreateCalculationItem(ComparisonObject comparisonObject, string tableName) private void CreateCalculationItem(ComparisonObject comparisonObject, string tableName)
{ {
if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Create)
comparisonObject.MergeAction == MergeAction.Create)
{ {
Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableSource = _sourceTabularModel.Tables.FindByName(tableName);
Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName);
@ -1869,8 +1867,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
private void UpdateCalculationItem(ComparisonObject comparisonObject, string tableName) private void UpdateCalculationItem(ComparisonObject comparisonObject, string tableName)
{ {
if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Update)
comparisonObject.MergeAction == MergeAction.Update)
{ {
Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableSource = _sourceTabularModel.Tables.FindByName(tableName);
Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName);

View File

@ -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.12.0" Language="en-US" Publisher="BISM Normalizer" /> <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.12.1" 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>