address build version issue and enhance logging (#5268)

frank-dong-ms-zz · web-flow · commit 1611f559cece · 2020-06-30T12:40:57.000-07:00
* make timeout larger as we are seeing timeouts in CI

* mitigate build version issue, enhance logging
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -66,6 +66,8 @@
   <!-- Version properties -->
   <PropertyGroup>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
+	<BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor>
+    <BuildNumberMinor Condition="'$(BuildNumberMinor)' == ''">0</BuildNumberMinor>
     <AssemblyFileVersion Condition="'$(AssemblyFileVersion)'==''">$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</AssemblyFileVersion>
 
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
diff --git a/src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderCursor.cs b/src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderCursor.cs
@@ -826,7 +826,7 @@ private IEnumerable<int> ParseParallel(ParallelState state)
                     foreach (var batch in state.GetBatches())
                     {
                         // If the collation of rows happened correctly, this should have a precise value.
-                        Contracts.Assert(batch.Total == _total + 1);
+                        Contracts.Assert(batch.Total == _total + 1, $"batch.Total:{batch.Total} while _total + 1:{_total + 1}.");
                         _total = batch.Total - 1;
                         for (int irow = batch.IrowMin; irow < batch.IrowLim; irow++)
                         {

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ private IEnumerable<int> ParseParallel(ParallelState state)`
`826`	`826`	`foreach (var batch in state.GetBatches())`
`827`	`827`	`{`
`828`	`828`	`// If the collation of rows happened correctly, this should have a precise value.`
`829`		`- Contracts.Assert(batch.Total == _total + 1);`
	`829`	`+ Contracts.Assert(batch.Total == _total + 1, $"batch.Total:{batch.Total} while _total + 1:{_total + 1}.");`
`830`	`830`	`_total = batch.Total - 1;`
`831`	`831`	`for (int irow = batch.IrowMin; irow < batch.IrowLim; irow++)`
`832`	`832`	`{`