Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions src/GitVersion.Output/Serializer/VersionVariableSerializer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.IO.Abstractions;
using System.Text.Encodings.Web;
using GitVersion.Extensions;
using GitVersion.Helpers;

Expand All @@ -9,8 +8,7 @@ internal class VersionVariableSerializer(IFileSystem fileSystem) : IVersionVaria
{
public static GitVersionVariables FromJson(string json)
{
var serializeOptions = JsonSerializerOptions();
var variablePairs = JsonSerializer.Deserialize<Dictionary<string, string>>(json, serializeOptions);
var variablePairs = JsonSerializer.Deserialize(json, VersionVariablesJsonContext.Custom.DictionaryStringString);
return FromDictionary(variablePairs);
}

Expand All @@ -25,9 +23,7 @@ public string ToJson(GitVersionVariables gitVersionVariables)
propertyInfo?.SetValue(variables, ChangeType(value, propertyInfo.PropertyType));
}

var serializeOptions = JsonSerializerOptions();

return JsonSerializer.Serialize(variables, serializeOptions);
return JsonSerializer.Serialize(variables, VersionVariablesJsonContext.Custom.VersionVariablesJsonModel);
}

public GitVersionVariables FromFile(string filePath)
Expand Down Expand Up @@ -94,8 +90,6 @@ private void ToFileInternal(GitVersionVariables gitVersionVariables, string file
fileSystem.File.WriteAllText(filePath, json);
}

private static JsonSerializerOptions JsonSerializerOptions() => new() { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, Converters = { new VersionVariablesJsonStringConverter() } };

private static object? ChangeType(object? value, Type type)
{
if (!type.IsGenericType || type.GetGenericTypeDefinition() != typeof(Nullable<>)) return Convert.ChangeType(value, type);
Expand Down
18 changes: 18 additions & 0 deletions src/GitVersion.Output/Serializer/VersionVariablesJsonContext.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System.Text.Encodings.Web;

namespace GitVersion.OutputVariables;

[JsonSourceGenerationOptions(
WriteIndented = true,
DefaultIgnoreCondition = JsonIgnoreCondition.Never,
Converters = [typeof(VersionVariablesJsonStringConverter)])]
[JsonSerializable(typeof(VersionVariablesJsonModel))]
[JsonSerializable(typeof(Dictionary<string, string>))]
internal partial class VersionVariablesJsonContext : JsonSerializerContext
{
public static VersionVariablesJsonContext Custom => field ??= new VersionVariablesJsonContext(
new JsonSerializerOptions(Default.Options)
{
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,11 @@ public override void Write(Utf8JsonWriter writer, string? value, JsonSerializerO
writer.WriteStringValue(value);
}

public override string ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
=> reader.GetString() ?? "";

public override void WriteAsPropertyName(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
=> writer.WritePropertyName(value);

public override bool HandleNull => true;
}
Loading