update to NET 6

Author: mihaj

.github/workflows/codeql-analysis.yml

@@ -22,10 +22,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Setup .NET Core 5.0
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:

.github/workflows/dotnet-core.yml

@@ -20,10 +20,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Setup .NET Core 5.0
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
     - name: Install dependencies
       run: dotnet restore
     - name: Build
@@ -48,10 +48,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Setup .NET Core 5.0
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
     - name: Pack NuGet
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:

.github/workflows/sonarqube-analysis.yml

@@ -16,12 +16,12 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Setup .NET Core 5.0
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
     - name: SonarScanner for .NET Core with pull request decoration support
-      uses: highbyte/sonarscan-dotnet@2.0
+      uses: highbyte/sonarscan-dotnet@v2.1.2
       with:
         sonarProjectKey: qatoolkit_qatoolkit-engine-bombardier-net
         sonarProjectName:  qatoolkit_qatoolkit-engine-bombardier-net

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.3.8</Version>
+    <Version>0.3.9</Version>
   </PropertyGroup>
 </Project>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Miha Jakovac
+Copyright (c) 2020-2022 Miha Jakovac
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/QAToolKit.Engine.Bombardier.Test/Assets/AddBike.json

@@ -34,7 +34,7 @@
       {
         "Name": "Bicycle",
         "Required": false,
-        "ContentType": 0,
+        "ContentType": "application/json",
         "Properties": [
           {
             "Name": "id",

src/QAToolKit.Engine.Bombardier.Test/Assets/UpdateBike.json

@@ -41,7 +41,7 @@
       {
         "Name": "Bicycle",
         "Required": false,
-        "ContentType": 0,
+        "ContentType": "application/json",
         "Properties": [
           {
             "Name": "id",

src/QAToolKit.Engine.Bombardier.Test/QAToolKit.Engine.Bombardier.Test.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	<LangVersion>latest</LangVersion>
 	<IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/QAToolKit.Engine.Bombardier/Helpers/ContentTypeHeaderHelper.cs

@@ -24,7 +24,7 @@ internal static string GenerateContentTypeHeader(HttpRequest request, ContentTyp
             }
             else
             {
-                var contentType = request.RequestBodies.FirstOrDefault(content => content.ContentType == useContentType);
+                var contentType = request.RequestBodies.FirstOrDefault(content => ContentType.ToEnum(content.ContentType) == useContentType);
 
                 if (contentType != null)
                 {

src/QAToolKit.Engine.Bombardier/Helpers/HttpBodyHelper.cs

@@ -31,7 +31,7 @@ internal static string GenerateHttpRequestBody(HttpRequest request, ContentType.
                 if (useContentType != ContentType.Enumeration.Json)
                     useContentType = ContentType.Enumeration.Json;
 
-                var useRequest = request.RequestBodies.FirstOrDefault(content => content.ContentType == useContentType);
+                var useRequest = request.RequestBodies.FirstOrDefault(content => ContentType.ToEnum(content.ContentType) == useContentType);
 
                 if (useRequest == null)
                     return String.Empty;