Refactor caching system in GitVersion #3797
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,7 +1,6 @@ | ||
| using System.Text.Encodings.Web; | ||
| using GitVersion.Extensions; | ||
| using GitVersion.Helpers; | ||
|
|
||
| namespace GitVersion.OutputVariables; | ||
|
|
||
|
|
@@ -14,6 +13,22 @@ public static GitVersionVariables FromJson(string json) | |
| return FromDictionary(variablePairs); | ||
| } | ||
|
|
||
| public static string ToJsonString(this GitVersionVariables gitVersionVariables) | ||
|
Member
There was a problem hiding this comment. Could we move the serialization of GitVersion/src/GitVersion.Core/GitVersion.Core.csproj Lines 14 to 19 in d3d16cc
Member
Author
There was a problem hiding this comment. I started gradually to remove the depenencies, or at least with those non microsoft first, hope we can get to a point when Core is dependency free*. For now I want to get this one to a point when the build passes and then we can prepare a beta.4 |
||
| { | ||
| var variablesType = typeof(VersionVariablesJsonModel); | ||
| var variables = new VersionVariablesJsonModel(); | ||
|
|
||
| foreach (var (key, value) in gitVersionVariables.OrderBy(x => x.Key)) | ||
| { | ||
| var propertyInfo = variablesType.GetProperty(key); | ||
| propertyInfo?.SetValue(variables, ChangeType(value, propertyInfo.PropertyType)); | ||
| } | ||
|
|
||
| var serializeOptions = JsonSerializerOptions(); | ||
|
|
||
| return JsonSerializer.Serialize(variables, serializeOptions); | ||
| } | ||
|
|
||
| public static GitVersionVariables FromFile(string filePath, IFileSystem fileSystem) | ||
| { | ||
| try | ||
|
|
@@ -33,20 +48,23 @@ public static GitVersionVariables FromFile(string filePath, IFileSystem fileSyst | |
| } | ||
| } | ||
|
|
||
| public static void ToFile(GitVersionVariables gitVersionVariables, string filePath, IFileSystem fileSystem) | ||
| { | ||
| try | ||
| { | ||
| var retryAction = new RetryAction<IOException>(); | ||
| retryAction.Execute(() => ToFileInternal(gitVersionVariables, filePath, fileSystem)); | ||
| } | ||
| catch (AggregateException ex) | ||
| { | ||
| var lastException = ex.InnerExceptions.LastOrDefault() ?? ex.InnerException; | ||
| if (lastException != null) | ||
| { | ||
| throw lastException; | ||
| } | ||
|
|
||
| throw; | ||
| } | ||
| } | ||
|
|
||
| private static GitVersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>>? properties) | ||
|
|
@@ -65,11 +83,15 @@ private static GitVersionVariables FromDictionary(IEnumerable<KeyValuePair<strin | |
|
|
||
| private static GitVersionVariables FromFileInternal(string filePath, IFileSystem fileSystem) | ||
| { | ||
| var json = fileSystem.ReadAllText(filePath); | ||
| var variables = FromJson(json); | ||
| return variables; | ||
| } | ||
|
|
||
| private static void ToFileInternal(GitVersionVariables gitVersionVariables, string filePath, IFileSystem fileSystem) | ||
| { | ||
| var json = gitVersionVariables.ToJsonString(); | ||
| fileSystem.WriteAllText(filePath, json); | ||
| } | ||
|
|
||
| private static JsonSerializerOptions JsonSerializerOptions() | ||
|
|
||
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
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.
Ideally, we shouldn't have a reference to
System.Text.Encodings.Webor anything else besidesSysteminGitVersion.Core.