build: target .netstandard2.0 (#33)

felixfbecker · Aug 2, 2019 · ea51307 · ea51307
1 parent 05a9a3c
commit ea51307
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/src/Cmdlets/CompareKubeResourceCmdlet.cs b/src/Cmdlets/CompareKubeResourceCmdlet.cs
@@ -49,8 +49,7 @@ protected override async Task ProcessRecordAsync(CancellationToken cancellationT
             string apiGroupVersion = (string)Original.ApiVersion;
             string apiVersion = apiGroupVersion.Split('/').Last();
             string kind = (string)Original.Kind;
-            Type type = ModelTypes.GetValueOrDefault((kind, apiVersion));
-            if (type == null) {
+            if (!ModelTypes.TryGetValue((kind, apiVersion), out Type type)) {
                 WriteError(new ErrorRecord(new Exception($"Unknown (kind: {kind}, apiVersion: {apiVersion}). {ModelTypes.Count} Known:\n{String.Join("\n", ModelTypes.Keys)}"), null, ErrorCategory.InvalidData, null));
                 return;
             }

diff --git a/src/Cmdlets/UpdateKubeResourceCmdlet.cs b/src/Cmdlets/UpdateKubeResourceCmdlet.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Management.Automation;
 using System.Reflection;
@@ -42,7 +43,10 @@ protected override async Task ProcessRecordAsync(CancellationToken cancellationT
                 var paths = GetResolvedProviderPathFromPSPath(Path, out provider);
                 foreach (var path in paths) {
                     WriteVerbose($"Reading object from YAML file {path}");
-                    var yaml = await System.IO.File.ReadAllTextAsync(path, cancellationToken);
+                    string yaml;
+                    using (var streamReader = File.OpenText(path)) {
+                        yaml = await streamReader.ReadToEndAsync();
+                    }
                     var modified = deserializer.Deserialize(yaml);
                     await updateResource(modified, cancellationToken);
                 }
@@ -62,8 +66,7 @@ private async Task updateResource(dynamic modified, CancellationToken cancellati
             }
 
             // Figure out the model class - needed for diffing
-            Type type = ModelTypes.GetValueOrDefault((kind, apiVersion));
-            if (type == null) {
+            if (!ModelTypes.TryGetValue((kind, apiVersion), out Type type)) {
                 WriteError(new ErrorRecord(new Exception($"Unknown (kind: {kind}, apiVersion: {apiVersion}). {ModelTypes.Count} Known:\n{String.Join("\n", ModelTypes.Keys)}"), null, ErrorCategory.InvalidData, Resource));
                 return;
             }

diff --git a/src/Cmdlets/UseKubeContextCmdlet.cs b/src/Cmdlets/UseKubeContextCmdlet.cs
@@ -25,7 +25,9 @@ protected override async Task ProcessRecordAsync(CancellationToken cancellationT
             Serializer serializer = new SerializerBuilder().Build();
             string yaml = serializer.Serialize(config);
             if (ShouldProcess(configPath, "update")) {
-                await File.WriteAllTextAsync(configPath, yaml); // Do not pass cancellationToken to not corrupt config file
+                using (var streamWriter = new StreamWriter(configPath)) {
+                    await streamWriter.WriteAsync(yaml); // Do not pass cancellationToken to not corrupt config file
+                }
             }
         }
     }

diff --git a/src/KubeResourceComparer.cs b/src/KubeResourceComparer.cs
@@ -239,8 +239,8 @@ public void CreateTwoWayPatch(object original, object modified, Type type, JsonP
                     } else {
                         logger.LogTrace("List is unordered set");
                         // Lists are to be treated like unordered sets
-                        HashSet<object> originalSet = originalEnumerable.ToHashSet();
-                        HashSet<object> modifiedSet = modifiedEnumerable.ToHashSet();
+                        var originalSet = new HashSet<object>(originalEnumerable);
+                        var modifiedSet = new HashSet<object>(modifiedEnumerable);
                         // The index to adress the element on the server after applying every operation in the patch so far.
                         int index = 0;
                         foreach (var originalElement in originalEnumerable) {

diff --git a/src/KubeYamlDeserializer.cs b/src/KubeYamlDeserializer.cs
@@ -31,8 +31,7 @@ public object Deserialize(string yaml) {
             string apiGroupVersion = (string)dict["apiVersion"];
             string apiVersion = apiGroupVersion.Split('/').Last();
             logger.LogDebug($"apiVersion {apiVersion}");
-            Type type = modelTypes.GetValueOrDefault((kind, apiVersion));
-            if (type == null) {
+            if (!modelTypes.TryGetValue((kind, apiVersion), out Type type)) {
                 throw new Exception($"Unknown (kind: {kind}, apiVersion: {apiVersion}). {modelTypes.Count} Known:\n{String.Join("\n", modelTypes.Keys)}");
             }
             return toPSObject(dict, type);

diff --git a/src/PSKubectl.csproj b/src/PSKubectl.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> -->
     </PropertyGroup>
     <ItemGroup>

diff --git a/src/SetKubeConfigCmdlet.cs b/src/SetKubeConfigCmdlet.cs
@@ -21,7 +21,9 @@ protected override async Task ProcessRecordAsync(CancellationToken cancellationT
             string yaml = serializer.Serialize(Config);
             string configPath = K8sConfig.Locate();
             if (ShouldProcess(configPath, "update")) {
-                await File.WriteAllTextAsync(configPath, yaml); // Do not pass cancellationToken to not corrupt config file
+                using (var streamWriter = new StreamWriter(configPath)) {
+                    await streamWriter.WriteAsync(yaml); // Do not pass cancellationToken to not corrupt config file
+                }
             }
         }
     }