diff --git a/build-utils/Build.Utilities/MsBuild/BinaryLogReader.cs b/build-utils/Build.Utilities/MsBuild/BinaryLogReader.cs index 1aca507f..5a1d5aee 100644 --- a/build-utils/Build.Utilities/MsBuild/BinaryLogReader.cs +++ b/build-utils/Build.Utilities/MsBuild/BinaryLogReader.cs @@ -16,9 +16,9 @@ public static string[] GetWarnings( string binaryLogName ) { ); return File.ReadAllLines( warningsLogName ) - .Select( + .Select( line => // Remove the leading " 4>" part - line => Regex.Replace( line, @"^\s*\d+>", string.Empty ) + Regex.Replace( line, @"^\s*\d+>", string.Empty ) ) .ToArray(); } diff --git a/build-utils/Build.Utilities/Versioning/ReleaseVersioningBase.cs b/build-utils/Build.Utilities/Versioning/ReleaseVersioningBase.cs index 171c2dc1..419dc65c 100644 --- a/build-utils/Build.Utilities/Versioning/ReleaseVersioningBase.cs +++ b/build-utils/Build.Utilities/Versioning/ReleaseVersioningBase.cs @@ -22,6 +22,8 @@ IGitHubClient gitHubClient ) { _repository = repository; _gitHubClient = gitHubClient; + Repository = repository; + GitHubClient = gitHubClient; if ( build.ExecutionPlan.Contains( build.Release ) && build.ExecutionPlan.Contains( build.PreRelease ) ) { throw new InvalidOperationException( @@ -40,7 +42,12 @@ IGitHubClient gitHubClient } } - [CanBeNull] public IReleaseInfo Release => this; + protected GitRepository Repository { get; } + + protected IGitHubClient GitHubClient { get; } + + [CanBeNull] + public IReleaseInfo Release => this; public abstract Task GetVersionAsync(); diff --git a/build-utils/Build.Utilities/Versioning/Strategies/ReleaseVersioning.cs b/build-utils/Build.Utilities/Versioning/Strategies/ReleaseVersioning.cs index f4d62a19..6e7ecdc6 100644 --- a/build-utils/Build.Utilities/Versioning/Strategies/ReleaseVersioning.cs +++ b/build-utils/Build.Utilities/Versioning/Strategies/ReleaseVersioning.cs @@ -30,9 +30,9 @@ private async Task GetVersionInternalAsync() { // TODO can now use .Latest(), since main release is no longer a prerelease // .Latest() does not return prereleases - var releases = await gitHubClient.Repository.Release.GetAll( - repository.GetGitHubOwner(), - repository.GetGitHubName() + var releases = await GitHubClient.Repository.Release.GetAll( + Repository.GetGitHubOwner(), + Repository.GetGitHubName() ); var latest = releases .OrderByDescending( r => r.PublishedAt )