From 58c749d01edd27fa9b39826dafdc9ccf5dbdd363 Mon Sep 17 00:00:00 2001 From: Muhammad Danish Date: Mon, 14 Aug 2023 12:17:39 +0500 Subject: [PATCH 1/5] Bump YamlDotNet to 13.2.0 --- src/WingetCreateCore/Common/Serialization.cs | 1 + src/WingetCreateCore/WingetCreateCore.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/WingetCreateCore/Common/Serialization.cs b/src/WingetCreateCore/Common/Serialization.cs index 45e3c1e2..e899aad7 100644 --- a/src/WingetCreateCore/Common/Serialization.cs +++ b/src/WingetCreateCore/Common/Serialization.cs @@ -42,6 +42,7 @@ public static ISerializer CreateSerializer() { var serializer = new SerializerBuilder() .WithNamingConvention(PascalCaseNamingConvention.Instance) + .WithDefaultScalarStyle(ScalarStyle.DoubleQuoted) .WithTypeConverter(new YamlStringEnumConverter()) .WithEmissionPhaseObjectGraphVisitor(args => new YamlSkipPropertyVisitor(args.InnerVisitor)) .WithEventEmitter(nextEmitter => new MultilineScalarFlowStyleEmitter(nextEmitter)) diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index f0c3f3e1..efc15c95 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -35,7 +35,7 @@ - + From 28d9d023b7072b7a6014a72c5928cc734985a29f Mon Sep 17 00:00:00 2001 From: Muhammad Danish Date: Mon, 14 Aug 2023 14:07:37 +0500 Subject: [PATCH 2/5] single quotes look relatively clean --- src/WingetCreateCore/Common/Serialization.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WingetCreateCore/Common/Serialization.cs b/src/WingetCreateCore/Common/Serialization.cs index e899aad7..a971f39f 100644 --- a/src/WingetCreateCore/Common/Serialization.cs +++ b/src/WingetCreateCore/Common/Serialization.cs @@ -42,7 +42,7 @@ public static ISerializer CreateSerializer() { var serializer = new SerializerBuilder() .WithNamingConvention(PascalCaseNamingConvention.Instance) - .WithDefaultScalarStyle(ScalarStyle.DoubleQuoted) + .WithDefaultScalarStyle(ScalarStyle.SingleQuoted) .WithTypeConverter(new YamlStringEnumConverter()) .WithEmissionPhaseObjectGraphVisitor(args => new YamlSkipPropertyVisitor(args.InnerVisitor)) .WithEventEmitter(nextEmitter => new MultilineScalarFlowStyleEmitter(nextEmitter)) From b2872127673d39d936ebb8f64f9ab4dac32dfd1c Mon Sep 17 00:00:00 2001 From: Muhammad Danish Date: Mon, 14 Aug 2023 20:17:06 +0500 Subject: [PATCH 3/5] Update src/WingetCreateCore/Common/Serialization.cs Co-authored-by: Kaleb Luedtke --- src/WingetCreateCore/Common/Serialization.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WingetCreateCore/Common/Serialization.cs b/src/WingetCreateCore/Common/Serialization.cs index a971f39f..26d016a1 100644 --- a/src/WingetCreateCore/Common/Serialization.cs +++ b/src/WingetCreateCore/Common/Serialization.cs @@ -42,7 +42,7 @@ public static ISerializer CreateSerializer() { var serializer = new SerializerBuilder() .WithNamingConvention(PascalCaseNamingConvention.Instance) - .WithDefaultScalarStyle(ScalarStyle.SingleQuoted) + .WithQuotingNecessaryStrings() .WithTypeConverter(new YamlStringEnumConverter()) .WithEmissionPhaseObjectGraphVisitor(args => new YamlSkipPropertyVisitor(args.InnerVisitor)) .WithEventEmitter(nextEmitter => new MultilineScalarFlowStyleEmitter(nextEmitter)) From 58ae2418932ceb17f43cdd3dbf47f5e563a862ff Mon Sep 17 00:00:00 2001 From: Muhammad Danish Date: Mon, 14 Aug 2023 20:19:46 +0500 Subject: [PATCH 4/5] nit: formatting --- src/WingetCreateCore/Common/Serialization.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WingetCreateCore/Common/Serialization.cs b/src/WingetCreateCore/Common/Serialization.cs index 26d016a1..eca2b27f 100644 --- a/src/WingetCreateCore/Common/Serialization.cs +++ b/src/WingetCreateCore/Common/Serialization.cs @@ -42,7 +42,7 @@ public static ISerializer CreateSerializer() { var serializer = new SerializerBuilder() .WithNamingConvention(PascalCaseNamingConvention.Instance) - .WithQuotingNecessaryStrings() + .WithQuotingNecessaryStrings() .WithTypeConverter(new YamlStringEnumConverter()) .WithEmissionPhaseObjectGraphVisitor(args => new YamlSkipPropertyVisitor(args.InnerVisitor)) .WithEventEmitter(nextEmitter => new MultilineScalarFlowStyleEmitter(nextEmitter)) From e52bf3886590deef6b12a87b889b75d34775e25c Mon Sep 17 00:00:00 2001 From: Muhammad Danish Date: Mon, 14 Aug 2023 20:41:20 +0500 Subject: [PATCH 5/5] docs say this should be called before Refer: https://github.com/aaubry/YamlDotNet/blob/bfba24411c54dee930cf87d93e313f6d724091b0/YamlDotNet/Serialization/SerializerBuilder.cs#L111-L115 --- src/WingetCreateCore/Common/Serialization.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WingetCreateCore/Common/Serialization.cs b/src/WingetCreateCore/Common/Serialization.cs index eca2b27f..0a399fd8 100644 --- a/src/WingetCreateCore/Common/Serialization.cs +++ b/src/WingetCreateCore/Common/Serialization.cs @@ -41,8 +41,8 @@ public static class Serialization public static ISerializer CreateSerializer() { var serializer = new SerializerBuilder() - .WithNamingConvention(PascalCaseNamingConvention.Instance) .WithQuotingNecessaryStrings() + .WithNamingConvention(PascalCaseNamingConvention.Instance) .WithTypeConverter(new YamlStringEnumConverter()) .WithEmissionPhaseObjectGraphVisitor(args => new YamlSkipPropertyVisitor(args.InnerVisitor)) .WithEventEmitter(nextEmitter => new MultilineScalarFlowStyleEmitter(nextEmitter))