NuGetUtils update #1645
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,99 @@ | ||
| namespace GitVersionTask | ||
| { | ||
| using System; | ||
| using System.IO; | ||
| using GitVersion; | ||
| using GitVersion.Helpers; | ||
|
|
||
| public static class GenerateGitVersionInformation | ||
| { | ||
| public static Output Execute( | ||
| Input input | ||
| ) | ||
| { | ||
| if ( !input.ValidateInput() ) | ||
| { | ||
| throw new Exception( "Invalid input." ); | ||
| } | ||
|
|
||
| var logger = new TaskLogger(); | ||
| Logger.SetLoggers( logger.LogInfo, logger.LogInfo, logger.LogWarning, s => logger.LogError( s ) ); | ||
|
|
||
|
|
||
| Output output = null; | ||
| try | ||
| { | ||
| output = InnerExecute(input ); | ||
| } | ||
| catch (WarningException errorException) | ||
| { | ||
| logger.LogWarning(errorException.Message); | ||
| output = new Output(); | ||
| } | ||
| catch (Exception exception) | ||
| { | ||
| logger.LogError("Error occurred: " + exception); | ||
| throw; | ||
| } | ||
| finally | ||
| { | ||
| Logger.Reset(); | ||
| } | ||
|
|
||
| return output; | ||
| } | ||
|
|
||
| private static Output InnerExecute( Input input ) | ||
| { | ||
| var execute = GitVersionTaskBase.CreateExecuteCore(); | ||
| if (!execute.TryGetVersion(input.SolutionDirectory, out var versionVariables, input.NoFetch, new Authentication())) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var fileWriteInfo = input.IntermediateOutputPath.GetWorkingDirectoryAndFileNameAndExtension( | ||
| input.Language, | ||
| input.ProjectFile, | ||
| ( pf, ext ) => $"GitVersionInformation.g.{ext}", | ||
| ( pf, ext ) => $"GitVersionInformation_{Path.GetFileNameWithoutExtension( pf )}_{Path.GetRandomFileName()}.g.{ext}" | ||
| ); | ||
|
|
||
| var output = new Output() | ||
| { | ||
| GitVersionInformationFilePath = Path.Combine( fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName ) | ||
| }; | ||
| var generator = new GitVersionInformationGenerator( fileWriteInfo.FileName, fileWriteInfo.WorkingDirectory, versionVariables, new FileSystem()); | ||
| generator.Generate(); | ||
|
|
||
| return output; | ||
| } | ||
|
|
||
| public sealed class Input | ||
|
There was a problem hiding this comment. @stazz, why isn't any form of inheritance used across the different There was a problem hiding this comment. I simply forgot to do that. I'll fix this on Sunday. |
||
| { | ||
| public string SolutionDirectory { get; set; } | ||
|
|
||
| public string ProjectFile { get; set; } | ||
|
|
||
| public string IntermediateOutputPath { get; set; } | ||
|
|
||
| public string Language { get; set; } | ||
|
|
||
| public bool NoFetch { get; set; } | ||
| } | ||
|
|
||
| private static Boolean ValidateInput( this Input input ) | ||
|
There was a problem hiding this comment. @stazz, why isn't this method placed inside the There was a problem hiding this comment. No particular reason. I guess the validity input depends a bit on a context (which I admit in this case is exactly one). Can move it as instance method of |
||
| { | ||
| return input != null | ||
| && !String.IsNullOrEmpty( input.SolutionDirectory ) | ||
| && !String.IsNullOrEmpty(input.ProjectFile) | ||
| // && !String.IsNullOrEmpty(input.IntermediateOutputPath) // This was marked as [Required] but it InnerExecute still seems to allow it to be null... ? | ||
| && !String.IsNullOrEmpty(input.Language) | ||
| ; | ||
| } | ||
|
|
||
| public sealed class Output | ||
| { | ||
| public string GitVersionInformationFilePath { get; set; } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stazz, why the change to
static classhere?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason is that the class has no state on its own anymore (instead, the
InputandOutputinner classes are used), so no instances of it will be created either.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. Thanks for the explanation.