kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: yamldotnet 16 support (#1574)

Browse Source 
* feat: yamldotnet 16 support

* update yamldotnet

* fix interface

* update Vecc.YamlDotNet.Analyzers.StaticGenerator
This commit is contained in:
Ivan Josipovic
2024-08-11 13:21:59 -07:00
committed by GitHub
parent e05bc143b9
commit 36a0204643
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Packages.props
View File

@@ -28,11 +28,11 @@
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="20.0.15" /> <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="20.0.15" />
<PackageVersion Include="System.Reactive" Version="6.0.0" /> <PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="7.0.3" /> <PackageVersion Include="System.Text.Json" Version="7.0.3" />
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="13.7.0" /> <PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.0.0" />
<PackageVersion Include="xunit" Version="2.6.6" /> <PackageVersion Include="xunit" Version="2.6.6" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" /> <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" /> <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
<PackageVersion Include="YamlDotNet" Version="15.1.0" /> <PackageVersion Include="YamlDotNet" Version="16.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Autofac" Version="8.0.0" /> <PackageVersion Include="Autofac" Version="8.0.0" />

4
src/KubernetesClient.Aot/KubernetesYaml.cs
View File

@@ -45,7 +45,7 @@ namespace k8s
return type == typeof(byte[]); return type == typeof(byte[]);
} }
public object ReadYaml(IParser parser, Type type) public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{ {
if (parser?.Current is Scalar scalar) if (parser?.Current is Scalar scalar)
{ {
@@ -67,7 +67,7 @@ namespace k8s
throw new InvalidOperationException(parser.Current?.ToString()); throw new InvalidOperationException(parser.Current?.ToString());
} }
public void WriteYaml(IEmitter emitter, object value, Type type) public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
{ {
var obj = (byte[])value; var obj = (byte[])value;
emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj))); emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj)));

4
src/KubernetesClient/KubernetesYaml.cs
View File

@@ -67,7 +67,7 @@ namespace k8s
return type == typeof(byte[]); return type == typeof(byte[]);
} }
public object ReadYaml(IParser parser, Type type) public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{ {
if (parser?.Current is Scalar scalar) if (parser?.Current is Scalar scalar)
{ {
@@ -89,7 +89,7 @@ namespace k8s
throw new InvalidOperationException(parser.Current?.ToString()); throw new InvalidOperationException(parser.Current?.ToString());
} }
public void WriteYaml(IEmitter emitter, object value, Type type) public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
{ {
var obj = (byte[])value; var obj = (byte[])value;
emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj))); emitter?.Emit(new Scalar(Encoding.UTF8.GetString(obj)));

4
src/KubernetesClient/Models/IntOrStringYamlConverter.cs
View File

@@ -10,7 +10,7 @@ namespace k8s.Models
return type == typeof(IntstrIntOrString); return type == typeof(IntstrIntOrString);
} }
public object ReadYaml(IParser parser, Type type) public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{ {
if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar) if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar)
{ {
@@ -32,7 +32,7 @@ namespace k8s.Models
throw new InvalidOperationException(parser?.Current?.ToString()); throw new InvalidOperationException(parser?.Current?.ToString());
} }
public void WriteYaml(IEmitter emitter, object value, Type type) public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
{ {
var obj = (IntstrIntOrString)value; var obj = (IntstrIntOrString)value;
emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.Value)); emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.Value));

5
src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs
View File

@@ -10,7 +10,7 @@ namespace k8s.Models
return type == typeof(ResourceQuantity); return type == typeof(ResourceQuantity);
} }
public object ReadYaml(IParser parser, Type type) public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
{ {
if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar) if (parser?.Current is YamlDotNet.Core.Events.Scalar scalar)
{ {
@@ -32,8 +32,7 @@ namespace k8s.Models
throw new InvalidOperationException(parser?.Current?.ToString()); throw new InvalidOperationException(parser?.Current?.ToString());
} }
public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
public void WriteYaml(IEmitter emitter, object value, Type type)
{ {
var obj = (ResourceQuantity)value; var obj = (ResourceQuantity)value;
emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.ToString())); emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.ToString()));