cleanup folders (#792)

* unify folders * move dep and target outside
2022-03-07 10:06:55 -08:00
parent c11e205a01
commit 01b2aa832c
48 changed files with 98 additions and 132 deletions
--- a/examples/Directory.Build.props
+++ b/examples/Directory.Build.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetFramework>net6</TargetFramework>
+  </PropertyGroup>
+</Project>
--- a/examples/Directory.Build.targets
+++ b/examples/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\src\KubernetesClient\KubernetesClient.csproj" />
+  </ItemGroup>
+</Project>
--- a/examples/GenericKubernetesApi/GenericKubernetesApi.csproj
+++ b/examples/GenericKubernetesApi/GenericKubernetesApi.csproj
@@ -2,11 +2,6 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
    </PropertyGroup>

-    <ItemGroup>
-      <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-    </ItemGroup>
-
 </Project>
--- a/examples/attach/attach.csproj
+++ b/examples/attach/attach.csproj
@@ -1,12 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
  <PropertyGroup>
    <OutputType>Exe</OutputType> 
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- 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<TSpec, TStatus> : CustomResource
    {
-        [JsonProperty(PropertyName = "spec")]
+        [JsonPropertyName("spec")]
        public TSpec Spec { get; set; }

-        [JsonProperty(PropertyName = "CStatus")]
+        [JsonPropertyName("CStatus")]
        public TStatus CStatus { get; set; }
    }

--- 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<CResource>();
-            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
            {
--- 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; }
    }
 }
--- a/examples/customResource/customResource.csproj
+++ b/examples/customResource/customResource.csproj
@@ -2,14 +2,10 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-        <PackageReference Include="Microsoft.Build" Version="16.11.0" />
-        <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="5.0.10" />
+      <PackageReference Include="JsonPatch.Net" Version="1.1.2" />
    </ItemGroup>

 </Project>
--- a/examples/exec/exec.csproj
+++ b/examples/exec/exec.csproj
@@ -1,12 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/generic/generic.csproj
+++ b/examples/generic/generic.csproj
@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
-    <LangVersion>7.1</LangVersion>
  </PropertyGroup>

 </Project>
--- a/examples/labels/labels.csproj
+++ b/examples/labels/labels.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/logs/logs.csproj
+++ b/examples/logs/logs.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/metrics/metrics.csproj
+++ b/examples/metrics/metrics.csproj
@@ -1,13 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
-
 </Project>
--- a/examples/namespace/namespace.csproj
+++ b/examples/namespace/namespace.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/nginx.yml
+++ b/examples/nginx.yml
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginx
-spec:
-  containers:
-  - name: nginx
-    image: nginx:1.7.9
-    ports:
-    - containerPort: 80
--- a/examples/patch/patch.csproj
+++ b/examples/patch/patch.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-    </ItemGroup>
-
 </Project>
--- a/examples/portforward/portforward.csproj
+++ b/examples/portforward/portforward.csproj
@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
  </PropertyGroup>

 </Project>
--- a/examples/prometheus/prometheus.csproj
+++ b/examples/prometheus/prometheus.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/simple/simple.csproj
+++ b/examples/simple/simple.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/examples/watch/watch.csproj
+++ b/examples/watch/watch.csproj
@@ -1,12 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
  </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
 </Project>
--- a/examples/yaml/Program.cs
+++ b/examples/yaml/Program.cs
@@ -14,7 +14,7 @@ namespace yaml
            var typeMap = new Dictionary<String, Type>();
            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);

--- a/examples/yaml/yaml.csproj
+++ b/examples/yaml/yaml.csproj
@@ -1,12 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
-  </ItemGroup>
-
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
  </PropertyGroup>
-
 </Project>