diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
new file mode 100644
index 0000000..ed02219
--- /dev/null
+++ b/examples/Directory.Build.props
@@ -0,0 +1,6 @@
+
+
+
+ net6
+
+
diff --git a/examples/Directory.Build.targets b/examples/Directory.Build.targets
new file mode 100644
index 0000000..3b78101
--- /dev/null
+++ b/examples/Directory.Build.targets
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/examples/GenericKubernetesApi/GenericKubernetesApi.csproj b/examples/GenericKubernetesApi/GenericKubernetesApi.csproj
index d9f6862..139aaf5 100644
--- a/examples/GenericKubernetesApi/GenericKubernetesApi.csproj
+++ b/examples/GenericKubernetesApi/GenericKubernetesApi.csproj
@@ -2,11 +2,6 @@
Exe
- net5.0
-
-
-
-
diff --git a/examples/attach/attach.csproj b/examples/attach/attach.csproj
index 4f6e2ae..5644cab 100755
--- a/examples/attach/attach.csproj
+++ b/examples/attach/attach.csproj
@@ -1,12 +1,7 @@
-
-
-
-
Exe
- net5
diff --git a/examples/customResource/CustomResourceDefinition.cs b/examples/customResource/CustomResourceDefinition.cs
index 302d22f..6bc3f43 100644
--- a/examples/customResource/CustomResourceDefinition.cs
+++ b/examples/customResource/CustomResourceDefinition.cs
@@ -1,7 +1,7 @@
using k8s;
using k8s.Models;
-using Newtonsoft.Json;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
[module: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "CA1724:TypeNamesShouldNotMatchNamespaces", Justification = "This is just an example.")]
[module: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "This is just an example.")]
@@ -23,16 +23,16 @@ namespace customResource
public abstract class CustomResource : KubernetesObject
{
- [JsonProperty(PropertyName = "metadata")]
+ [JsonPropertyName("metadata")]
public V1ObjectMeta Metadata { get; set; }
}
public abstract class CustomResource : CustomResource
{
- [JsonProperty(PropertyName = "spec")]
+ [JsonPropertyName("spec")]
public TSpec Spec { get; set; }
- [JsonProperty(PropertyName = "CStatus")]
+ [JsonPropertyName("CStatus")]
public TStatus CStatus { get; set; }
}
diff --git a/examples/customResource/Program.cs b/examples/customResource/Program.cs
index 2ea51ed..c8635ed 100644
--- a/examples/customResource/Program.cs
+++ b/examples/customResource/Program.cs
@@ -1,9 +1,10 @@
+using Json.Patch;
using k8s;
using k8s.Autorest;
using k8s.Models;
-using Microsoft.AspNetCore.JsonPatch;
using System;
using System.Collections.Generic;
+using System.Text.Json;
using System.Threading.Tasks;
@@ -55,11 +56,13 @@ namespace customResource
Console.WriteLine("- CR Item {0} = {1}", crs.Items.IndexOf(cr), cr.Metadata.Name);
}
- // updating the custom resource
+ var old = JsonSerializer.SerializeToDocument(myCr);
myCr.Metadata.Labels.TryAdd("newKey", "newValue");
- var patch = new JsonPatchDocument();
- patch.Replace(x => x.Metadata.Labels, myCr.Metadata.Labels);
- patch.Operations.ForEach(x => x.path = x.path.ToLower());
+
+ var expected = JsonSerializer.SerializeToDocument(myCr);
+ var patch = old.CreatePatch(expected);
+
+ // updating the custom resource
var crPatch = new V1Patch(patch, V1Patch.PatchType.JsonPatch);
try
{
diff --git a/examples/customResource/cResource.cs b/examples/customResource/cResource.cs
index 188ee84..f9df60b 100644
--- a/examples/customResource/cResource.cs
+++ b/examples/customResource/cResource.cs
@@ -1,5 +1,5 @@
using k8s.Models;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
namespace customResource
{
@@ -21,13 +21,13 @@ namespace customResource
public class CResourceSpec
{
- [JsonProperty(PropertyName = "cityName")]
+ [JsonPropertyName("cityName")]
public string CityName { get; set; }
}
public class CResourceStatus : V1Status
{
- [JsonProperty(PropertyName = "temperature", NullValueHandling = NullValueHandling.Ignore)]
+ [JsonPropertyName("temperature")]
public string Temperature { get; set; }
}
}
diff --git a/examples/customResource/customResource.csproj b/examples/customResource/customResource.csproj
index 15c3cfb..4b6bb35 100644
--- a/examples/customResource/customResource.csproj
+++ b/examples/customResource/customResource.csproj
@@ -2,14 +2,10 @@
Exe
- net5.0
-
-
-
-
+
diff --git a/examples/exec/exec.csproj b/examples/exec/exec.csproj
index ecfb5fe..52e6553 100755
--- a/examples/exec/exec.csproj
+++ b/examples/exec/exec.csproj
@@ -1,12 +1,7 @@
-
-
-
-
Exe
- net5
diff --git a/examples/generic/generic.csproj b/examples/generic/generic.csproj
index 651bf99..52e6553 100644
--- a/examples/generic/generic.csproj
+++ b/examples/generic/generic.csproj
@@ -1,13 +1,7 @@
-
-
-
-
Exe
- net5
- 7.1
diff --git a/examples/labels/labels.csproj b/examples/labels/labels.csproj
index 028b76a..52e6553 100755
--- a/examples/labels/labels.csproj
+++ b/examples/labels/labels.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
+
Exe
- net5
diff --git a/examples/logs/logs.csproj b/examples/logs/logs.csproj
index 028b76a..52e6553 100755
--- a/examples/logs/logs.csproj
+++ b/examples/logs/logs.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
+
Exe
- net5
diff --git a/examples/metrics/metrics.csproj b/examples/metrics/metrics.csproj
index 098194a..52e6553 100644
--- a/examples/metrics/metrics.csproj
+++ b/examples/metrics/metrics.csproj
@@ -1,13 +1,7 @@
-
+
Exe
- net5
-
-
-
-
-
diff --git a/examples/namespace/namespace.csproj b/examples/namespace/namespace.csproj
index 29e6232..f850aa9 100644
--- a/examples/namespace/namespace.csproj
+++ b/examples/namespace/namespace.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
+
Exe
- net5
diff --git a/examples/nginx.yml b/examples/nginx.yml
deleted file mode 100644
index b92a713..0000000
--- a/examples/nginx.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
- name: nginx
-spec:
- containers:
- - name: nginx
- image: nginx:1.7.9
- ports:
- - containerPort: 80
\ No newline at end of file
diff --git a/examples/patch/patch.csproj b/examples/patch/patch.csproj
index 131fa5d..f850aa9 100644
--- a/examples/patch/patch.csproj
+++ b/examples/patch/patch.csproj
@@ -1,12 +1,7 @@
-
+
Exe
- net5
-
-
-
-
diff --git a/examples/portforward/portforward.csproj b/examples/portforward/portforward.csproj
index 2f90dd4..e3b6154 100644
--- a/examples/portforward/portforward.csproj
+++ b/examples/portforward/portforward.csproj
@@ -1,13 +1,7 @@
-
-
-
-
Exe
- netcoreapp2.1
- 7.1
\ No newline at end of file
diff --git a/examples/prometheus/prometheus.csproj b/examples/prometheus/prometheus.csproj
index 028b76a..52e6553 100755
--- a/examples/prometheus/prometheus.csproj
+++ b/examples/prometheus/prometheus.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
+
Exe
- net5
diff --git a/examples/simple/simple.csproj b/examples/simple/simple.csproj
index 028b76a..52e6553 100755
--- a/examples/simple/simple.csproj
+++ b/examples/simple/simple.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
+
Exe
- net5
diff --git a/examples/watch/watch.csproj b/examples/watch/watch.csproj
index 89f728c..f850aa9 100644
--- a/examples/watch/watch.csproj
+++ b/examples/watch/watch.csproj
@@ -1,12 +1,7 @@
-
+
Exe
- net5
-
-
-
-
diff --git a/examples/yaml/Program.cs b/examples/yaml/Program.cs
index 88fc4ac..06185f1 100644
--- a/examples/yaml/Program.cs
+++ b/examples/yaml/Program.cs
@@ -14,7 +14,7 @@ namespace yaml
var typeMap = new Dictionary();
typeMap.Add("v1/Pod", typeof(V1Pod));
typeMap.Add("v1/Service", typeof(V1Service));
- typeMap.Add("apps/v1beta1/Deployment", typeof(Appsv1beta1Deployment));
+ typeMap.Add("apps/v1/Deployment", typeof(V1Deployment));
var objects = await Yaml.LoadAllFromFileAsync(args[0], typeMap);
diff --git a/examples/yaml/yaml.csproj b/examples/yaml/yaml.csproj
index a6cdcb9..d1e5b47 100644
--- a/examples/yaml/yaml.csproj
+++ b/examples/yaml/yaml.csproj
@@ -1,12 +1,5 @@
-
-
-
-
-
Exe
- netcoreapp2.0
-
\ No newline at end of file
diff --git a/kubernetes-client.sln b/kubernetes-client.sln
index ca62d27..2d7eec7 100644
--- a/kubernetes-client.sln
+++ b/kubernetes-client.sln
@@ -27,8 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8AF4A5C2
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesClient.Tests", "tests\KubernetesClient.Tests\KubernetesClient.Tests.csproj", "{806AD0E5-833F-42FB-A870-4BCEE7F4B17F}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{879F8787-C3BB-43F3-A92D-6D4C7D3A5285}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "patch", "examples\patch\patch.csproj", "{04DE2C84-117D-4E21-8B45-B7AE627697BD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "metrics", "examples\metrics\metrics.csproj", "{B9647AD4-F6B0-406F-8B79-6781E31600EC}"
@@ -43,7 +41,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericKubernetesApi", "exa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generic", "examples\generic\generic.csproj", "{F06D4C3A-7825-43A8-832B-6BDE3D355486}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibKubernetesGenerator", "gen\LibKubernetesGenerator\LibKubernetesGenerator.csproj", "{E92670D3-831E-430D-8FAC-138BF9977F3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibKubernetesGenerator", "src\LibKubernetesGenerator\LibKubernetesGenerator.csproj", "{64C71596-B916-46EF-8115-B53E238F79D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "portforward", "examples\portforward\portforward.csproj", "{DFBB1025-BD22-459D-A04D-E2AB31E129E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "prometheus", "examples\prometheus\prometheus.csproj", "{682B94E4-1761-48FF-B5D0-87B45DC0C735}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "yaml", "examples\yaml\yaml.csproj", "{17AB0AD8-6C90-42DD-880C-16B5AC4A373F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -247,18 +251,54 @@ Global
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x64.Build.0 = Release|Any CPU
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x86.ActiveCfg = Release|Any CPU
{F06D4C3A-7825-43A8-832B-6BDE3D355486}.Release|x86.Build.0 = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|x64.Build.0 = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Debug|x86.Build.0 = Debug|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|Any CPU.Build.0 = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|x64.ActiveCfg = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|x64.Build.0 = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|x86.ActiveCfg = Release|Any CPU
- {E92670D3-831E-430D-8FAC-138BF9977F3F}.Release|x86.Build.0 = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x64.Build.0 = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Debug|x86.Build.0 = Debug|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x64.ActiveCfg = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x64.Build.0 = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x86.ActiveCfg = Release|Any CPU
+ {64C71596-B916-46EF-8115-B53E238F79D4}.Release|x86.Build.0 = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|x64.Build.0 = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Debug|x86.Build.0 = Debug|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|x64.ActiveCfg = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|x64.Build.0 = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|x86.ActiveCfg = Release|Any CPU
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2}.Release|x86.Build.0 = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|x64.Build.0 = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Debug|x86.Build.0 = Debug|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|Any CPU.Build.0 = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|x64.ActiveCfg = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|x64.Build.0 = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|x86.ActiveCfg = Release|Any CPU
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735}.Release|x86.Build.0 = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|x64.Build.0 = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Debug|x86.Build.0 = Debug|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.ActiveCfg = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x64.Build.0 = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.ActiveCfg = Release|Any CPU
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -280,7 +320,10 @@ Global
{95672061-5799-4454-ACDB-D6D330DB1EC4} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{F81AE4C4-E044-4225-BD76-385A0DE621FD} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
{F06D4C3A-7825-43A8-832B-6BDE3D355486} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
- {E92670D3-831E-430D-8FAC-138BF9977F3F} = {879F8787-C3BB-43F3-A92D-6D4C7D3A5285}
+ {64C71596-B916-46EF-8115-B53E238F79D4} = {3D1864AA-1FFC-4512-BB13-46055E410F73}
+ {DFBB1025-BD22-459D-A04D-E2AB31E129E2} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
+ {682B94E4-1761-48FF-B5D0-87B45DC0C735} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
+ {17AB0AD8-6C90-42DD-880C-16B5AC4A373F} = {B70AFB57-57C9-46DC-84BE-11B7DDD34B40}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {049A763A-C891-4E8D-80CF-89DD3E22ADC7}
diff --git a/util/src/KubernetesClient.Util/KubernetesClient.Util.csproj b/src/KubernetesClient.Util/KubernetesClient.Util.csproj
similarity index 100%
rename from util/src/KubernetesClient.Util/KubernetesClient.Util.csproj
rename to src/KubernetesClient.Util/KubernetesClient.Util.csproj
diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
index bd314c5..4605072 100644
--- a/src/KubernetesClient/KubernetesClient.csproj
+++ b/src/KubernetesClient/KubernetesClient.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/gen/LibKubernetesGenerator/ApiGenerator.cs b/src/LibKubernetesGenerator/ApiGenerator.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/ApiGenerator.cs
rename to src/LibKubernetesGenerator/ApiGenerator.cs
diff --git a/gen/LibKubernetesGenerator/ClassNameHelper.cs b/src/LibKubernetesGenerator/ClassNameHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/ClassNameHelper.cs
rename to src/LibKubernetesGenerator/ClassNameHelper.cs
diff --git a/gen/LibKubernetesGenerator/GeneralNameHelper.cs b/src/LibKubernetesGenerator/GeneralNameHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/GeneralNameHelper.cs
rename to src/LibKubernetesGenerator/GeneralNameHelper.cs
diff --git a/gen/LibKubernetesGenerator/GeneratorExecutionContextExt.cs b/src/LibKubernetesGenerator/GeneratorExecutionContextExt.cs
similarity index 89%
rename from gen/LibKubernetesGenerator/GeneratorExecutionContextExt.cs
rename to src/LibKubernetesGenerator/GeneratorExecutionContextExt.cs
index 8cf0282..4e7e894 100644
--- a/gen/LibKubernetesGenerator/GeneratorExecutionContextExt.cs
+++ b/src/LibKubernetesGenerator/GeneratorExecutionContextExt.cs
@@ -13,7 +13,7 @@ namespace LibKubernetesGenerator
public static void RenderToContext(this GeneratorExecutionContext context, string templatefile, object data, string generatedfile)
{
context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.projectdir", out var root);
- var generated = Render.FileToString(Path.Combine(root, "..", "..", "gen", "LibKubernetesGenerator", "templates", templatefile), data);
+ var generated = Render.FileToString(Path.Combine(root, "..", "LibKubernetesGenerator", "templates", templatefile), data);
context.AddSource(generatedfile, SourceText.From(generated, Encoding.UTF8));
}
}
diff --git a/gen/LibKubernetesGenerator/INustacheHelper.cs b/src/LibKubernetesGenerator/INustacheHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/INustacheHelper.cs
rename to src/LibKubernetesGenerator/INustacheHelper.cs
diff --git a/gen/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs b/src/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs
rename to src/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs
diff --git a/gen/LibKubernetesGenerator/LibKubernetesGenerator.csproj b/src/LibKubernetesGenerator/LibKubernetesGenerator.csproj
similarity index 100%
rename from gen/LibKubernetesGenerator/LibKubernetesGenerator.csproj
rename to src/LibKubernetesGenerator/LibKubernetesGenerator.csproj
diff --git a/gen/LibKubernetesGenerator/MetaHelper.cs b/src/LibKubernetesGenerator/MetaHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/MetaHelper.cs
rename to src/LibKubernetesGenerator/MetaHelper.cs
diff --git a/gen/LibKubernetesGenerator/ModelExtGenerator.cs b/src/LibKubernetesGenerator/ModelExtGenerator.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/ModelExtGenerator.cs
rename to src/LibKubernetesGenerator/ModelExtGenerator.cs
diff --git a/gen/LibKubernetesGenerator/ModelGenerator.cs b/src/LibKubernetesGenerator/ModelGenerator.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/ModelGenerator.cs
rename to src/LibKubernetesGenerator/ModelGenerator.cs
diff --git a/gen/LibKubernetesGenerator/ParamHelper.cs b/src/LibKubernetesGenerator/ParamHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/ParamHelper.cs
rename to src/LibKubernetesGenerator/ParamHelper.cs
diff --git a/gen/LibKubernetesGenerator/PluralHelper.cs b/src/LibKubernetesGenerator/PluralHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/PluralHelper.cs
rename to src/LibKubernetesGenerator/PluralHelper.cs
diff --git a/gen/LibKubernetesGenerator/StringHelpers.cs b/src/LibKubernetesGenerator/StringHelpers.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/StringHelpers.cs
rename to src/LibKubernetesGenerator/StringHelpers.cs
diff --git a/gen/LibKubernetesGenerator/TypeHelper.cs b/src/LibKubernetesGenerator/TypeHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/TypeHelper.cs
rename to src/LibKubernetesGenerator/TypeHelper.cs
diff --git a/gen/LibKubernetesGenerator/UtilHelper.cs b/src/LibKubernetesGenerator/UtilHelper.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/UtilHelper.cs
rename to src/LibKubernetesGenerator/UtilHelper.cs
diff --git a/gen/LibKubernetesGenerator/VersionConverterGenerator.cs b/src/LibKubernetesGenerator/VersionConverterGenerator.cs
similarity index 100%
rename from gen/LibKubernetesGenerator/VersionConverterGenerator.cs
rename to src/LibKubernetesGenerator/VersionConverterGenerator.cs
diff --git a/gen/LibKubernetesGenerator/templates/IKubernetes.cs.template b/src/LibKubernetesGenerator/templates/IKubernetes.cs.template
similarity index 100%
rename from gen/LibKubernetesGenerator/templates/IKubernetes.cs.template
rename to src/LibKubernetesGenerator/templates/IKubernetes.cs.template
diff --git a/gen/LibKubernetesGenerator/templates/Kubernetes.cs.template b/src/LibKubernetesGenerator/templates/Kubernetes.cs.template
similarity index 100%
rename from gen/LibKubernetesGenerator/templates/Kubernetes.cs.template
rename to src/LibKubernetesGenerator/templates/Kubernetes.cs.template
diff --git a/gen/LibKubernetesGenerator/templates/KubernetesExtensions.cs.template b/src/LibKubernetesGenerator/templates/KubernetesExtensions.cs.template
similarity index 100%
rename from gen/LibKubernetesGenerator/templates/KubernetesExtensions.cs.template
rename to src/LibKubernetesGenerator/templates/KubernetesExtensions.cs.template
diff --git a/gen/LibKubernetesGenerator/templates/Model.cs.template b/src/LibKubernetesGenerator/templates/Model.cs.template
similarity index 100%
rename from gen/LibKubernetesGenerator/templates/Model.cs.template
rename to src/LibKubernetesGenerator/templates/Model.cs.template
diff --git a/gen/LibKubernetesGenerator/templates/ModelExtensions.cs.template b/src/LibKubernetesGenerator/templates/ModelExtensions.cs.template
similarity index 100%
rename from gen/LibKubernetesGenerator/templates/ModelExtensions.cs.template
rename to src/LibKubernetesGenerator/templates/ModelExtensions.cs.template
diff --git a/util/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj b/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj
similarity index 93%
rename from util/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj
rename to tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj
index ccd876b..28b0115 100644
--- a/util/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj
+++ b/tests/KubernetesClient.Util.Tests/KubernetesClient.Util.Tests.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/util/src/KubernetesClient.Util/KubernetesClient.Util.csproj.DotSettings b/util/src/KubernetesClient.Util/KubernetesClient.Util.csproj.DotSettings
deleted file mode 100644
index 6162834..0000000
--- a/util/src/KubernetesClient.Util/KubernetesClient.Util.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- CSharp90
\ No newline at end of file