Merge pull request #23 from colemickens/netstandard2

brendandburns · web-flow · commit d68e94018cd8 · 2017-09-15T16:11:21.000-07:00
move to .NET Standard 2.0
diff --git a/examples/simple/PodList.cs b/examples/simple/PodList.cs
@@ -1,4 +1,4 @@
-﻿namespace simple
+namespace simple
 {
     using System;
     using System.IO;
diff --git a/examples/simple/simple.csproj b/examples/simple/simple.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="3.0.3" />
diff --git a/kubernetes-client.sln b/kubernetes-client.sln
@@ -1,4 +1,4 @@
-﻿
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.16
diff --git a/src/Exceptions/KubeConfigException.cs b/src/Exceptions/KubeConfigException.cs
@@ -1,4 +1,4 @@
-﻿namespace k8s.Exceptions
+namespace k8s.Exceptions
 {
     using System;
 
diff --git a/src/Exceptions/KubernetesClientException.cs b/src/Exceptions/KubernetesClientException.cs
@@ -1,4 +1,4 @@
-﻿namespace k8s.Exceptions
+namespace k8s.Exceptions
 {
     using System;
 
diff --git a/src/Kubernetes.Auth.cs b/src/Kubernetes.Auth.cs
@@ -1,4 +1,4 @@
-﻿namespace k8s
+namespace k8s
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
@@ -8,7 +8,7 @@
     using System.Threading.Tasks;
     using k8s.Exceptions;
     using Microsoft.Rest;
-    
+
     public partial class Kubernetes : ServiceClient<Kubernetes>, IKubernetes
     {
         /// <summary>
diff --git a/src/KubernetesClient.csproj b/src/KubernetesClient.csproj
@@ -1,6 +1,6 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="GlobalSuppressions.cs" />
diff --git a/src/KubernetesClientConfiguration.cs b/src/KubernetesClientConfiguration.cs
@@ -155,7 +155,7 @@ private void Initialize(K8SConfiguration k8SConfig, string currentContext = null
             }
             else if (!string.IsNullOrEmpty(clusterDetails.ClusterEndpoint.CertificateAuthority))
             {
-                this.SslCaCert = new X509Certificate2(clusterDetails.ClusterEndpoint.CertificateAuthority, null);
+                this.SslCaCert = new X509Certificate2(clusterDetails.ClusterEndpoint.CertificateAuthority);
             }
             this.SkipTlsVerify = clusterDetails.ClusterEndpoint.SkipTlsVerify;
 
diff --git a/src/KubernetesClientCredentials.cs b/src/KubernetesClientCredentials.cs
@@ -1,4 +1,4 @@
-﻿namespace k8s
+namespace k8s
 {
     using System;
     using System.Globalization;
diff --git a/src/Utils.cs b/src/Utils.cs
@@ -1,4 +1,4 @@
-﻿namespace k8s
+namespace k8s
 {
     using k8s.Exceptions;
     using System;
diff --git a/tests/KubernetesClientConfigurationTests.cs b/tests/KubernetesClientConfigurationTests.cs
@@ -1,13 +1,14 @@
-﻿using Xunit;
+using Xunit;
 using System.IO;
 
 namespace k8s.Tests
 {
     public class KubernetesClientConfigurationTests
     {
 
-        public static string readLine(string fileName) {
-            StreamReader reader = new StreamReader(new FileStream(fileName,  FileMode.Open, FileAccess.Read));
+        public static string readLine(string fileName)
+        {
+            StreamReader reader = new StreamReader(new FileStream(fileName, FileMode.Open, FileAccess.Read));
             return reader.ReadLine();
         }
 
@@ -63,7 +64,7 @@ public static string readLine(string fileName) {
         public void ConfigurationFileNotFound()
         {
             var fi = new FileInfo("/path/to/nowhere");
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));         
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
         }
 
         /// <summary>
@@ -74,17 +75,17 @@ public void DefaultConfigurationLoaded()
         {
             var cfg = new KubernetesClientConfiguration(new FileInfo(kubeConfigFileName));
             Assert.NotNull(cfg.Host);
-        } 
-        
+        }
+
         /// <summary>
         /// Check if host is properly loaded, per context
         /// </summary>
         [Theory]
         [InlineData("federal-context", "https://horse.org:4443")]
         [InlineData("queen-anne-context", "https://pig.org:443")]
         public void ContextHostTest(string context, string host)
-        {            
-            var fi = new FileInfo(kubeConfigFileName);            
+        {
+            var fi = new FileInfo(kubeConfigFileName);
             var cfg = new KubernetesClientConfiguration(fi, context);
             Assert.Equal(host, cfg.Host);
         }
@@ -99,11 +100,11 @@ public void ContextHostTest(string context, string host)
         [InlineData("queen-anne-context", "black-token")]
         public void ContextUserTokenTest(string context, string token)
         {
-            var fi = new FileInfo(kubeConfigFileName);            
-            var cfg = new KubernetesClientConfiguration(fi, context);     
+            var fi = new FileInfo(kubeConfigFileName);
+            var cfg = new KubernetesClientConfiguration(fi, context);
             Assert.Equal(context, cfg.CurrentContext);
             Assert.Null(cfg.Username);
-            Assert.Equal(token, cfg.AccessToken);                 
+            Assert.Equal(token, cfg.AccessToken);
         }
 
         /// <summary>
@@ -113,7 +114,7 @@ public void ContextUserTokenTest(string context, string token)
         /// <param name="clientCertData">'client-certificate-data' node content</param>
         /// <param name="clientCertKey">'client-key-data' content</param>
         [Theory]
-        [InlineData("federal-context", "assets/client.crt" ,"assets/client.key")]
+        [InlineData("federal-context", "assets/client.crt", "assets/client.key")]
         public void ContextCertificateTest(string context, string clientCert, string clientCertKey)
         {
             var fi = new FileInfo(kubeConfigFileName);
@@ -147,7 +148,7 @@ public void ClientDataTest(string context)
         public void ContextNotFoundTest()
         {
             var fi = new FileInfo(kubeConfigFileName);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context-not-found"));         
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context-not-found"));
         }
 
         /// <summary>
@@ -157,8 +158,8 @@ public void ContextNotFoundTest()
         public void NoContexts()
         {
             var fi = new FileInfo(kubeConfigNoContexts);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));         
-        }  
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+        }
 
         /// <summary>
         /// Test if KubeConfigException is thrown when no Contexts are set and we specify a concrete context name
@@ -167,7 +168,7 @@ public void NoContexts()
         public void NoContextsExplicit()
         {
             var fi = new FileInfo(kubeConfigNoContexts);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context"));         
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context"));
         }
 
         /// <summary>
@@ -189,7 +190,7 @@ public void UserPasswordAuthentication()
         public void IncompleteUserCredentials()
         {
             var fi = new FileInfo(kubeConfigNoCredentials);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi)); 
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
         }
 
         /// <summary>
@@ -199,7 +200,7 @@ public void IncompleteUserCredentials()
         public void ServerNotFound()
         {
             var fi = new FileInfo(kubeConfigNoServer);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi)); 
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
         }
 
         /// <summary>
@@ -209,17 +210,17 @@ public void ServerNotFound()
         public void ClusterNotFound()
         {
             var fi = new FileInfo(kubeConfigNoCluster);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi)); 
-        }  
-        
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+        }
+
         /// <summary>
         /// Checks that a KubeConfigException is thrown when the cluster defined in clusters and contexts do not match
         /// </summary>
         [Fact]
         public void ClusterNameMissmatch()
         {
             var fi = new FileInfo(kubeConfigClusterMissmatch);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi)); 
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
         }
 
         /// <summary>
@@ -229,7 +230,7 @@ public void ClusterNameMissmatch()
         public void CheckClusterTlsCorrectness()
         {
             var fi = new FileInfo(kubeConfigTlsNoSkipError);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi)); 
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
         }
 
         /// <summary>
@@ -239,11 +240,11 @@ public void CheckClusterTlsCorrectness()
         public void CheckClusterTlsSkipCorrectness()
         {
             var fi = new FileInfo(kubeConfigTlsSkip);
-            var cfg = new KubernetesClientConfiguration(fi);            
+            var cfg = new KubernetesClientConfiguration(fi);
             Assert.NotNull(cfg.Host);
             Assert.Null(cfg.SslCaCert);
             Assert.True(cfg.SkipTlsVerify);
-        }        
+        }
 
         // /// <summary>
         // /// Checks if the are pods
diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -1,6 +1,6 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace simple`
	`1`	`+namespace simple`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.IO;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<ItemGroup>`
`4`	`4`	`<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="3.0.3" />`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+`
`2`	`2`	`Microsoft Visual Studio Solution File, Format Version 12.00`
`3`	`3`	`# Visual Studio 15`
`4`	`4`	`VisualStudioVersion = 15.0.26430.16`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace k8s.Exceptions`
	`1`	`+namespace k8s.Exceptions`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace k8s`
	`1`	`+namespace k8s`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Diagnostics.CodeAnalysis;`
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using k8s.Exceptions;`
`10`	`10`	`using Microsoft.Rest;`
`11`		`-`
	`11`	`+`
`12`	`12`	`public partial class Kubernetes : ServiceClient<Kubernetes>, IKubernetes`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private void Initialize(K8SConfiguration k8SConfig, string currentContext = null`
`155`	`155`	`}`
`156`	`156`	`else if (!string.IsNullOrEmpty(clusterDetails.ClusterEndpoint.CertificateAuthority))`
`157`	`157`	`{`
`158`		`- this.SslCaCert = new X509Certificate2(clusterDetails.ClusterEndpoint.CertificateAuthority, null);`
	`158`	`+ this.SslCaCert = new X509Certificate2(clusterDetails.ClusterEndpoint.CertificateAuthority);`
`159`	`159`	`}`
`160`	`160`	`this.SkipTlsVerify = clusterDetails.ClusterEndpoint.SkipTlsVerify;`
`161`	`161`