Skip to content

Commit 97f95aa

Browse files
christianwadechristianwade
committed
lineageTag option
1 parent 408bba6 commit 97f95aa

File tree

26 files changed

+128
-88
lines changed

26 files changed

+128
-88
lines changed

‎BismNormalizer/AlmToolkit/Program.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ static void Main(string[] args)
3333
}
3434
catch { }
3535

36+
// Default web requests like AAD Auth to use windows credentials for proxy auth
37+
System.Net.WebRequest.DefaultWebProxy.Credentials = System.Net.CredentialCache.DefaultNetworkCredentials;
38+
3639
if (args != null && args.Length > 0)
3740
{
3841
if (args.Length > 1)

‎BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("5.0.14.1")]
36-
[assembly: AssemblyFileVersion("5.0.14.1")]
35+
[assembly: AssemblyVersion("5.0.19.0")]
36+
[assembly: AssemblyFileVersion("5.0.19.0")]

‎BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2758,7 +2758,7 @@
27582758
{
27592759
"Name" = "8:.NET Framework"
27602760
"Message" = "8:[VSDNETMSG]"
2761-
"FrameworkVersion" = "8:v4.6.1 "
2761+
"FrameworkVersion" = "8:v4.6.1 "
27622762
"AllowLaterVersions" = "11:FALSE"
27632763
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
27642764
}
@@ -2770,7 +2770,7 @@
27702770
{
27712771
"AssemblyRegister" = "3:1"
27722772
"AssemblyIsInGAC" = "11:FALSE"
2773-
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.13.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
2773+
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.19.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
27742774
"ScatterAssemblies"
27752775
{
27762776
"_0020EC0A2900F50F0F5DCC3E7BBE4237"
@@ -5517,7 +5517,7 @@
55175517
{
55185518
"AssemblyRegister" = "3:1"
55195519
"AssemblyIsInGAC" = "11:FALSE"
5520-
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
5520+
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
55215521
"ScatterAssemblies"
55225522
{
55235523
"_7344099411A9D2DBF4A784E3DE9EA77D"
@@ -6052,7 +6052,7 @@
60526052
{
60536053
"AssemblyRegister" = "3:1"
60546054
"AssemblyIsInGAC" = "11:FALSE"
6055-
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
6055+
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
60566056
"ScatterAssemblies"
60576057
{
60586058
"_82DAFE8276E3EAF6338E99A4D478878D"
@@ -8283,7 +8283,7 @@
82838283
{
82848284
"AssemblyRegister" = "3:1"
82858285
"AssemblyIsInGAC" = "11:FALSE"
8286-
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
8286+
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
82878287
"ScatterAssemblies"
82888288
{
82898289
"_E6C48E30804B563751F799BDB82D2D5F"
@@ -8505,7 +8505,7 @@
85058505
{
85068506
"AssemblyRegister" = "3:1"
85078507
"AssemblyIsInGAC" = "11:FALSE"
8508-
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
8508+
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
85098509
"ScatterAssemblies"
85108510
{
85118511
"_EEEF3B4DA37D965DCA452A1E7B283C82"
@@ -8636,7 +8636,7 @@
86368636
{
86378637
"AssemblyRegister" = "3:1"
86388638
"AssemblyIsInGAC" = "11:FALSE"
8639-
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
8639+
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
86408640
"ScatterAssemblies"
86418641
{
86428642
"_F27EC43FC3B12703E1AC626345868C2F"
@@ -9173,15 +9173,15 @@
91739173
{
91749174
"Name" = "8:Microsoft Visual Studio"
91759175
"ProductName" = "8:Power BI ALM Toolkit"
9176-
"ProductCode" = "8:{2E0BDA2B-E9E8-4EB5-8457-D605A99AE425}"
9177-
"PackageCode" = "8:{7DC33FCE-CA0B-49E6-8D38-925D0F3A6BD4}"
9176+
"ProductCode" = "8:{B6710539-C113-440C-AF14-CA2C17D9A5B0}"
9177+
"PackageCode" = "8:{7B4467F7-6352-49FC-A54E-AB68E6890C88}"
91789178
"UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}"
91799179
"AspNetVersion" = "8:4.0.30319.0"
91809180
"RestartWWWService" = "11:FALSE"
91819181
"RemovePreviousVersions" = "11:TRUE"
91829182
"DetectNewerInstalledVersion" = "11:TRUE"
91839183
"InstallAllUsers" = "11:TRUE"
9184-
"ProductVersion" = "8:5.0.14"
9184+
"ProductVersion" = "8:5.0.19"
91859185
"Manufacturer" = "8:Power BI ALM Toolkit"
91869186
"ARPHELPTELEPHONE" = "8:"
91879187
"ARPHELPLINK" = "8:"

‎BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("5.0.14.1")]
36-
[assembly: AssemblyFileVersion("5.0.14.1")]
35+
[assembly: AssemblyVersion("5.0.19.0")]
36+
[assembly: AssemblyFileVersion("5.0.19.0")]

‎BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("5.0.14.1")]
36-
[assembly: AssemblyFileVersion("5.0.14.1")]
35+
[assembly: AssemblyVersion("5.0.19.0")]
36+
[assembly: AssemblyFileVersion("5.0.19.0")]

‎BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe

0 Bytes
Binary file not shown.

‎BismNormalizer/BismNormalizer/BismNormalizer.exe

0 Bytes
Binary file not shown.

‎BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// You can specify all the values or you can default the Build and Revision Numbers
3030
// by using the '*' as shown below:
3131
// [assembly: AssemblyVersion("1.0.*")]
32-
[assembly: AssemblyVersion("5.0.14.1")]
33-
[assembly: AssemblyFileVersion("5.0.14.1")]
32+
[assembly: AssemblyVersion("5.0.19.0")]
33+
[assembly: AssemblyFileVersion("5.0.19.0")]

‎BismNormalizer/BismNormalizer/Settings.Designer.cs

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BismNormalizer/BismNormalizer/Settings.settings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,8 @@
8383
<Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
8484
<Value Profile="(Default)">True</Value>
8585
</Setting>
86+
<Setting Name="OptionLineageTag" Type="System.Boolean" Scope="User">
87+
<Value Profile="(Default)">True</Value>
88+
</Setting>
8689
</Settings>
8790
</SettingsFile>

‎BismNormalizer/BismNormalizer/TabularCompare/OptionsInfo.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class OptionsInfo
1919
private bool _optionRoles;
2020
private bool _optionActions;
2121
private bool _optionPartitions;
22+
private bool _optionLineageTag;
2223
private bool _optionRetainPartitions;
2324
private bool _optionRetainPolicyPartitions;
2425
private bool _optionRetainStorageMode;
@@ -39,6 +40,7 @@ public OptionsInfo()
3940
_optionRoles = Settings.Default.OptionRoles;
4041
_optionActions = Settings.Default.OptionActions;
4142
_optionPartitions = Settings.Default.OptionPartitions;
43+
_optionLineageTag = Settings.Default.OptionLineageTag;
4244
_optionRetainPartitions = Settings.Default.OptionRetainPartitions;
4345
_optionRetainPolicyPartitions = Settings.Default.OptionRetainPolicyPartitions;
4446
_optionRetainStorageMode = Settings.Default.OptionRetainStorageMode;
@@ -112,6 +114,15 @@ public bool OptionPartitions
112114
set { _optionPartitions = value; }
113115
}
114116

117+
/// <summary>
118+
/// A Boolean specifying whether to consider LineageTag when comparing objects.
119+
/// </summary>
120+
public bool OptionLineageTag
121+
{
122+
get { return _optionLineageTag; }
123+
set { _optionLineageTag = value; }
124+
}
125+
115126
/// <summary>
116127
/// A Boolean specifying whether to retain partitions for table updates.
117128
/// </summary>
@@ -189,6 +200,7 @@ public void Save()
189200
Settings.Default.OptionRoles = _optionRoles;
190201
Settings.Default.OptionActions = _optionActions;
191202
Settings.Default.OptionPartitions = _optionPartitions;
203+
Settings.Default.OptionLineageTag = _optionLineageTag;
192204
Settings.Default.OptionRetainPartitions = _optionRetainPartitions;
193205
Settings.Default.OptionRetainPolicyPartitions = _optionRetainPolicyPartitions;
194206
Settings.Default.OptionRetainStorageMode = _optionRetainStorageMode;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalculationItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class CalculationItem : TabularObject
2323
/// <param name="parentTable">Table object that the calculationItem belongs to.</param>
2424
/// <param name="tomCalculationItem">Tabular Object Model CalculationItem object abtstracted by the CalculationItem class.</param>
2525
/// <param name="isKpi">Indicates whether the calculationItem is a KPI.</param>
26-
public CalculationItem(Table parentTable, Tom.CalculationItem tomCalculationItem) : base(tomCalculationItem)
26+
public CalculationItem(Table parentTable, Tom.CalculationItem tomCalculationItem) : base(tomCalculationItem, parentTable.ParentTabularModel)
2727
{
2828
_parentTable = parentTable;
2929
_tomCalculationItem = tomCalculationItem;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Culture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class Culture : TabularObject
2222
/// </summary>
2323
/// <param name="parentTabularModel">TabularModel object that the Culture object belongs to.</param>
2424
/// <param name="tomCulture">Tabular Object Model Culture object abtstracted by the Culture class.</param>
25-
public Culture(TabularModel parentTabularModel, Tom.Culture tomCulture) : base(tomCulture)
25+
public Culture(TabularModel parentTabularModel, Tom.Culture tomCulture) : base(tomCulture, parentTabularModel)
2626
{
2727
_parentTabularModel = parentTabularModel;
2828
_tomCulture = tomCulture;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/DataSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class DataSource : TabularObject
1818
/// </summary>
1919
/// <param name="parentTabularModel">TabularModel object that the DataSource object belongs to.</param>
2020
/// <param name="datasource">Tabular Object Model ProviderDataSource object abtstracted by the DataSource class.</param>
21-
public DataSource(TabularModel parentTabularModel, Microsoft.AnalysisServices.Tabular.DataSource dataSource) : base(dataSource)
21+
public DataSource(TabularModel parentTabularModel, Microsoft.AnalysisServices.Tabular.DataSource dataSource) : base(dataSource, parentTabularModel)
2222
{
2323
_parentTabularModel = parentTabularModel;
2424
_tomDataSource = dataSource;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Expression.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class Expression : TabularObject
1515
/// </summary>
1616
/// <param name="parentTabularModel">TabularModel object that the Expression object belongs to.</param>
1717
/// <param name="expression">Tabular Object Model Expression object abtstracted by the Expression class.</param>
18-
public Expression(TabularModel parentTabularModel, NamedExpression expression) : base(expression)
18+
public Expression(TabularModel parentTabularModel, NamedExpression expression) : base(expression, parentTabularModel)
1919
{
2020
_parentTabularModel = parentTabularModel;
2121
_tomExpression = expression;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Measure.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class Measure : TabularObject
2424
/// <param name="parentTable">Table object that the measure belongs to.</param>
2525
/// <param name="tomMeasure">Tabular Object Model Measure object abtstracted by the Measure class.</param>
2626
/// <param name="isKpi">Indicates whether the measure is a KPI.</param>
27-
public Measure(Table parentTable, Tom.Measure tomMeasure, bool isKpi) : base(tomMeasure)
27+
public Measure(Table parentTable, Tom.Measure tomMeasure, bool isKpi) : base(tomMeasure, parentTable.ParentTabularModel)
2828
{
2929
_parentTable = parentTable;
3030
_tomMeasure = tomMeasure;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Model.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class Model : TabularObject
2222
/// </summary>
2323
/// <param name="parentTabularModel">TabularModel object that the Model object belongs to.</param>
2424
/// <param name="tomModel">Tabular Object Model Model object abtstracted by the Model class.</param>
25-
public Model(TabularModel parentTabularModel, Tom.Model tomModel) : base(tomModel)
25+
public Model(TabularModel parentTabularModel, Tom.Model tomModel) : base(tomModel, parentTabularModel)
2626
{
2727
_parentTabularModel = parentTabularModel;
2828
_tomModel = tomModel;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Perspective.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class Perspective : TabularObject
1717
/// </summary>
1818
/// <param name="parentTabularModel">TabularModel object that the perspective belongs to.</param>
1919
/// <param name="tomPerspective">Tabular Object Model Perspective object abtstracted by the Perspective class.</param>
20-
public Perspective(TabularModel parentTabularModel, Tom.Perspective tomPerspective): base(tomPerspective)
20+
public Perspective(TabularModel parentTabularModel, Tom.Perspective tomPerspective): base(tomPerspective, parentTabularModel)
2121
{
2222
_parentTabularModel = parentTabularModel;
2323
_tomPerspective = tomPerspective;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Relationship.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Relationship : TabularObject
2727
/// <param name="modifiedInternalName">Boolean indicating whether the TOM Relationship object Name property was changed to avoid name conflict.</param>
2828
/// <param name="oldInternalName">If the TOM Relationship object Name property was changed, this parameter shows the old value.</param>
2929
public Relationship(Table table, SingleColumnRelationship tomRelationship, bool copiedFromSource = false, bool modifiedInternalName = false, string oldInternalName = "")
30-
: base(tomRelationship)
30+
: base(tomRelationship, table.ParentTabularModel)
3131
{
3232
_table = table;
3333
_tomRelationship = tomRelationship;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Role.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class Role : TabularObject
1515
/// </summary>
1616
/// <param name="parentTabularModel">TabularModel object that the Role object belongs to.</param>
1717
/// <param name="role">Tabular Object Model Role object abtstracted by the Role class.</param>
18-
public Role(TabularModel parentTabularModel, ModelRole role) : base(role)
18+
public Role(TabularModel parentTabularModel, ModelRole role) : base(role, parentTabularModel)
1919
{
2020
_parentTabularModel = parentTabularModel;
2121
_tomRole = role;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Table.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class Table : TabularObject
2929
/// </summary>
3030
/// <param name="parentTabularModel">TabularModel object that the Table object belongs to.</param>
3131
/// <param name="tomTable">Tabular Object Model Table object abtstracted by the Table class.</param>
32-
public Table(TabularModel parentTabularModel, Tom.Table tomTable) : base(tomTable)
32+
public Table(TabularModel parentTabularModel, Tom.Table tomTable) : base(tomTable, parentTabularModel)
3333
{
3434
_parentTabularModel = parentTabularModel;
3535
_tomTable = tomTable;

‎BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularObject.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@ public class TabularObject
1616
{
1717
private string _objectDefinition;
1818
private string _name;
19+
private TabularModel _parentTabularModel;
1920

2021
/// <summary>
2122
/// Initializes a new instance of the TabularObject class.
2223
/// </summary>
2324
/// <param name="namedMetaDataObject">The Tabular Object Model supertype of the class being abstracted.</param>
24-
public TabularObject(NamedMetadataObject namedMetaDataObject)
25+
public TabularObject(NamedMetadataObject namedMetaDataObject, TabularModel parentTabularModel)
2526
{
2627
_name = namedMetaDataObject.Name;
2728
if (namedMetaDataObject is Tom.Model) return; //Model has custom JSON string
28-
29+
30+
_parentTabularModel = parentTabularModel;
31+
2932
//Serialize json
3033
SerializeOptions options = new SerializeOptions();
3134
options.IgnoreInferredProperties = true;
@@ -41,6 +44,15 @@ public TabularObject(NamedMetadataObject namedMetaDataObject)
4144
_objectDefinition = token.ToString(Formatting.Indented);
4245
}
4346

47+
//Remove lineageTag if required
48+
if (_parentTabularModel != null && _parentTabularModel.ComparisonInfo != null &&
49+
!_parentTabularModel.ComparisonInfo.OptionsInfo.OptionLineageTag)
50+
{
51+
JToken token = JToken.Parse(_objectDefinition);
52+
RemovePropertyFromObjectDefinition(token, "lineageTag");
53+
_objectDefinition = token.ToString(Formatting.Indented);
54+
}
55+
4456
////todo: remove with Giri's fix
4557
////Remove return characters
4658
//if (namedMetaDataObject is Tom.NamedExpression || namedMetaDataObject is Tom.Table)

0 commit comments

Comments
 (0)