Consolidate package versions, and explicitly target net6.0 in samples

tintoy · Dec 10, 2022 · 1f0bc12 · 1f0bc12
1 parent 66e42d5
commit 1f0bc12
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 dist: trusty
 language: csharp
 mono: none
-dotnet: 2.1
+dotnet: 6.0
 git:
   depth: 9999999
 branches:

diff --git a/samples/ConfigFromConfigMap/ConfigFromConfigMap.csproj b/samples/ConfigFromConfigMap/ConfigFromConfigMap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/samples/DeploymentWithRollback/DeploymentWithRollback.csproj b/samples/DeploymentWithRollback/DeploymentWithRollback.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/samples/ExtensionsSample/ExtensionsSample.csproj b/samples/ExtensionsSample/ExtensionsSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/WatchEvents/WatchEvents.csproj b/samples/WatchEvents/WatchEvents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/samples/noob-exec/NoobExec.csproj b/samples/noob-exec/NoobExec.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AssemblyName>noob-exec</AssemblyName>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/...ubeClient.Extensions.DependencyInjection/KubeClient.Extensions.DependencyInjection.csproj b/...ubeClient.Extensions.DependencyInjection/KubeClient.Extensions.DependencyInjection.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
       <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
   </ItemGroup>

diff --git a/src/KubeClient.Extensions.KubeConfig/KubeClient.Extensions.KubeConfig.csproj b/src/KubeClient.Extensions.KubeConfig/KubeClient.Extensions.KubeConfig.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="HTTPlease.Core" Version="$(PackageVersion_HTTPlease)" />
+      <PackageReference Include="HTTPlease.Core" Version="1.8.9" />
       <PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
       <PackageReference Include="System.Reactive" Version="3.1.1" />

diff --git a/src/KubeClient.Extensions.WebSockets/KubeClient.Extensions.WebSockets.csproj b/src/KubeClient.Extensions.WebSockets/KubeClient.Extensions.WebSockets.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <Description>WebSockets support for KubeClient</Description>
   </PropertyGroup>
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="HTTPlease.Core" Version="$(PackageVersion_HTTPlease)" />
+      <PackageReference Include="HTTPlease.Core" Version="1.8.9" />
       <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0-pre-05" />
   </ItemGroup>
 

diff --git a/src/KubeClient/KubeClient.csproj b/src/KubeClient/KubeClient.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="HTTPlease.Core" Version="$(PackageVersion_HTTPlease)" />
-      <PackageReference Include="HTTPlease.Diagnostics" Version="$(PackageVersion_HTTPlease)" />
-      <PackageReference Include="HTTPlease.Formatters.Json" Version="$(PackageVersion_HTTPlease)" />
+      <PackageReference Include="HTTPlease.Core" Version="1.8.9" />
+      <PackageReference Include="HTTPlease.Diagnostics" Version="1.8.9" />
+      <PackageReference Include="HTTPlease.Formatters.Json" Version="1.8.9" />
       <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="1.1.2" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
       <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />

diff --git a/...ubeClient.Extensions.Configuration.Tests/KubeClient.Extensions.Configuration.Tests.csproj b/...ubeClient.Extensions.Configuration.Tests/KubeClient.Extensions.Configuration.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
 
     <IsPackable>false</IsPackable>
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HTTPlease.Core" Version="$(PackageVersion_HTTPlease)" />
-    <PackageReference Include="HTTPlease.Diagnostics" Version="$(PackageVersion_HTTPlease)" />
-    <PackageReference Include="HTTPlease.Formatters.Json" Version="$(PackageVersion_HTTPlease)" />
-    <PackageReference Include="HTTPlease.Testability.Xunit" Version="$(PackageVersion_HTTPlease)" />
+    <PackageReference Include="HTTPlease.Core" Version="1.8.9" />
+    <PackageReference Include="HTTPlease.Diagnostics" Version="1.8.9" />
+    <PackageReference Include="HTTPlease.Formatters.Json" Version="1.8.9" />
+    <PackageReference Include="HTTPlease.Testability.Xunit" Version="1.8.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="System.Reactive" Version="3.1.1" />
   </ItemGroup>

diff --git a/test/KubeClient.Extensions.KubeConfig.Tests/KubeClient.Extensions.KubeConfig.Tests.csproj b/test/KubeClient.Extensions.KubeConfig.Tests/KubeClient.Extensions.KubeConfig.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/KubeClient.Extensions.WebSockets.Tests/KubeClient.Extensions.WebSockets.Tests.csproj b/test/KubeClient.Extensions.WebSockets.Tests/KubeClient.Extensions.WebSockets.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/KubeClient.Extensions.WebSockets.Tests/WebSocketTestBase.cs b/test/KubeClient.Extensions.WebSockets.Tests/WebSocketTestBase.cs
@@ -156,7 +156,7 @@ protected async Task Disconnect(WebSocket clientSocket, WebSocket serverSocket,
                 Log.LogInformation("Closing client socket...");
 
                 await clientSocket.CloseAsync(closeStatus, closeStatusDescription, TestCancellation).ConfigureAwait(false);
-                Assert.Equal(WebSocketState.Aborted, clientSocket.State); // AF: Not sure whether or not this is a bug in CoreFX. See if it occurs when we directly use ClientWebSocket.
+                Assert.Equal(WebSocketState.Closed, clientSocket.State);
 
                 Log.LogInformation("Client socket closed (CloseStatus = '{CloseStatus}', CloseStatusDescription = '{CloseStatusDescription}').", clientSocket.CloseStatus, clientSocket.CloseStatusDescription);
 

diff --git a/test/KubeClient.Tests/KubeClient.Tests.csproj b/test/KubeClient.Tests/KubeClient.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
 
     <IsPackable>false</IsPackable>
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-      <PackageReference Include="HTTPlease.Core" Version="$(PackageVersion_HTTPlease)" />
-      <PackageReference Include="HTTPlease.Diagnostics" Version="$(PackageVersion_HTTPlease)" />
-      <PackageReference Include="HTTPlease.Formatters.Json" Version="$(PackageVersion_HTTPlease)" />
-      <PackageReference Include="HTTPlease.Testability.Xunit" Version="$(PackageVersion_HTTPlease)" />
+      <PackageReference Include="HTTPlease.Core" Version="1.8.9" />
+      <PackageReference Include="HTTPlease.Diagnostics" Version="1.8.9" />
+      <PackageReference Include="HTTPlease.Formatters.Json" Version="1.8.9" />
+      <PackageReference Include="HTTPlease.Testability.Xunit" Version="1.8.9" />
       <PackageReference Include="System.Reactive" Version="3.1.1" />
   </ItemGroup>