Skip to content

address build version issue and enhance logging #5268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 30, 2020
Merged

address build version issue and enhance logging #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4a189b
make timeout larger as we are seeing timeouts in CI
frank-dong-ms Jun 29, 2020
90e3716
mitigate build version issue, enhance logging
frank-dong-ms Jul 2, 2020
34b3e6a
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
frank-dong-ms Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
<!-- Version properties -->
<PropertyGroup>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor>
<BuildNumberMinor Condition="'$(BuildNumberMinor)' == ''">0</BuildNumberMinor>
Copy link
Contributor

@harishsk harishsk Jun 30, 2020 •
edited by frank-dong-ms-zz
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious. Is there a restriction on the format for BuildNumberMajor that it has to have the four leading zeros? #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BuildNumberMajor is 5 digit number like 29008 so set default BuildNumberMajor as 00001

In reply to: 447871778 [](ancestors = 447871778)

<AssemblyFileVersion Condition="'$(AssemblyFileVersion)'==''">$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</AssemblyFileVersion>

<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderCursor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
{
Expand Down