feat: upgrade to net5.0

Christoph Bühler · Christoph Bühler · commit 285c92d9bdc8 · 2020-12-10T15:44:52.000+01:00
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
diff --git a/config/CodeAnalysis.targets b/config/CodeAnalysis.targets
@@ -2,7 +2,7 @@
 
     <ItemGroup>
         <PackageReference Include="Roslynator.Analyzers" Version="3.0.0" PrivateAssets="All"/>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="All"/>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.261" PrivateAssets="All"/>
         <AdditionalFiles Include="$(MSBuildThisFileDirectory)/stylecop.json"/>
     </ItemGroup>
 
diff --git a/config/Common.targets b/config/Common.targets
@@ -1,9 +1,9 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <LangVersion>8</LangVersion>
+        <LangVersion>9</LangVersion>
         <Authors>Christoph Bühler</Authors>
         <Owner>cbuehler</Owner>
     </PropertyGroup>
diff --git a/src/KubeOps/Operator/Client/ClientUrlFixer.cs b/src/KubeOps/Operator/Client/ClientUrlFixer.cs
@@ -12,7 +12,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
             HttpRequestMessage request,
             CancellationToken cancellationToken)
         {
-            if (request.RequestUri.Segments.Count(s => s == "/") > 1)
+            if (request.RequestUri?.Segments.Count(s => s == "/") > 1)
             {
                 // This request uri contains "empty" segments. (i.e. https://.../apis//v1/...)
                 // This means, this is a default api group (/api/v1)
diff --git a/src/KubeOps/Operator/Entities/Extensions/DeepCloneExtensions.cs b/src/KubeOps/Operator/Entities/Extensions/DeepCloneExtensions.cs
@@ -4,6 +4,7 @@
 using k8s;
 using k8s.Models;
 using KubeOps.Operator.Comparing;
+using ReferenceEqualityComparer = KubeOps.Operator.Comparing.ReferenceEqualityComparer;
 
 namespace KubeOps.Operator.Entities.Extensions
 {
diff --git a/tests/KubeOps.Test/KubeOps.Test.csproj b/tests/KubeOps.Test/KubeOps.Test.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <LangVersion>8</LangVersion>
+        <LangVersion>9</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
diff --git a/tests/KubeOps.TestOperator.Test/KubeOps.TestOperator.Test.csproj b/tests/KubeOps.TestOperator.Test/KubeOps.TestOperator.Test.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <LangVersion>8</LangVersion>
+        <LangVersion>9</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
diff --git a/tests/KubeOps.TestOperator/KubeOps.TestOperator.csproj b/tests/KubeOps.TestOperator/KubeOps.TestOperator.csproj
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>CS1591</NoWarn>
     </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ protected override async Task<HttpResponseMessage> SendAsync(`
`12`	`12`	`HttpRequestMessage request,`
`13`	`13`	`CancellationToken cancellationToken)`
`14`	`14`	`{`
`15`		`- if (request.RequestUri.Segments.Count(s => s == "/") > 1)`
	`15`	`+ if (request.RequestUri?.Segments.Count(s => s == "/") > 1)`
`16`	`16`	`{`
`17`	`17`	`// This request uri contains "empty" segments. (i.e. https://.../apis//v1/...)`
`18`	`18`	`// This means, this is a default api group (/api/v1)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using k8s;`
`5`	`5`	`using k8s.Models;`
`6`	`6`	`using KubeOps.Operator.Comparing;`
	`7`	`+using ReferenceEqualityComparer = KubeOps.Operator.Comparing.ReferenceEqualityComparer;`
`7`	`8`
`8`	`9`	`namespace KubeOps.Operator.Entities.Extensions`
`9`	`10`	`{`