Upgrade to .netcore5.0 (#28)

* Upgrade to .netcore5.0 * updated github action
MindFlavor · Apr 3, 2021 · e0eed83 · e0eed83
1 parent 214d49f
commit e0eed83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 5.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/Counters/CustomCounter.cs b/Counters/CustomCounter.cs
@@ -63,7 +63,7 @@ public string QueryAndSerializeData()
                 //sb.Append(GenerateHeader());
                 sb.Append(sbCustomCounter);
 
-                return sb.ToString();
+                return $"# HELP {Configuration.HelpText}\n# TYPE {Configuration.Name} {Configuration.CounterType}\n{sb.ToString()}";
             }
         }
     }

diff --git a/MindFlavor.SQLServerExporter.csproj b/MindFlavor.SQLServerExporter.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <Version>1.1.3.0</Version>
+    <Version>1.1.4.0</Version>
     <Authors>Francesco Cogno</Authors>
     <Copyright>Apache License Version 2.0</Copyright>
     <PackageLicenseUrl>https://raw.githubusercontent.com/MindFlavor/prometheus_sql_server_exporter/master/LICENSE</PackageLicenseUrl>
@@ -15,14 +15,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="embed\PerformanceCountersMapping.csv" />
     <EmbeddedResource Include="embed\sql\generic\*.sql" />
     <EmbeddedResource Include="embed\sql\11\0\*.sql" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+  </ItemGroup>
+
 </Project>