Cleanup

ahydrax · Feb 27, 2021 · 0fa9ec2 · 0fa9ec2
1 parent 53a51b3
commit 0fa9ec2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/Hangfire.Heartbeat.sln b/Hangfire.Heartbeat.sln
@@ -7,6 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.Heartbeat", "src\H
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangfire.Heartbeat.TestApplication", "tests\Hangfire.Heartbeat.TestApplication\Hangfire.Heartbeat.TestApplication.csproj", "{F02D7907-38A0-4020-9D20-E03E9523B9A5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9DD375E1-9F69-4B56-AADD-A10A677CA959}"
+ProjectSection(SolutionItems) = preProject
+	.github\workflows\build-and-publish-nuget.yml = .github\workflows\build-and-publish-nuget.yml
+	.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Viktor Svyatokha
+Copyright (c) 2021 Viktor Svyatokha
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Hangfire.Heartbeat/ConfigurationExtensions.cs b/src/Hangfire.Heartbeat/ConfigurationExtensions.cs
@@ -22,25 +22,25 @@ public static IGlobalConfiguration UseHeartbeatPage(this IGlobalConfiguration co
             DashboardRoutes.Routes.Add(OverviewPage.StatsRoute, new UtilizationJsonDispatcher());
 
             DashboardRoutes.Routes.Add(
-                "/heartbeat/jsknockout",
+                "/heartbeat/knockout.js",
                 new ContentDispatcher("application/javascript", "Hangfire.Heartbeat.Dashboard.js.knockout-3.4.2.js",
                     TimeSpan.FromDays(30)));
 
             DashboardRoutes.Routes.Add(
-                "/heartbeat/jsknockoutorderable",
+                "/heartbeat/knockoutorderable.js",
                 new ContentDispatcher("application/javascript", "Hangfire.Heartbeat.Dashboard.js.knockout.bindings.orderable.js",
                     TimeSpan.FromDays(30)));
 
             DashboardRoutes.Routes.Add(
-                "/heartbeat/jsnumeral",
+                "/heartbeat/numeral.js",
                 new ContentDispatcher("application/javascript", "Hangfire.Heartbeat.Dashboard.js.numeral.min.js", TimeSpan.FromDays(30)));
 
             DashboardRoutes.Routes.Add(
-                "/heartbeat/jspage",
+                "/heartbeat/page.js",
                 new ContentDispatcher("application/javascript", "Hangfire.Heartbeat.Dashboard.js.OverviewPage.js", TimeSpan.FromSeconds(1)));
 
             DashboardRoutes.Routes.Add(
-                "/heartbeat/cssstyles",
+                "/heartbeat/styles.css",
                 new ContentDispatcher("text/css", "Hangfire.Heartbeat.Dashboard.css.styles.css", TimeSpan.FromSeconds(1)));
 
             return config;

diff --git a/src/Hangfire.Heartbeat/Dashboard/html/OverviewPage.html b/src/Hangfire.Heartbeat/Dashboard/html/OverviewPage.html
@@ -1,8 +1,8 @@
-<link rel="stylesheet" type="text/css" href="heartbeat/cssstyles" />
-<script defer type="text/javascript" src="heartbeat/jsknockout"></script>
-<script defer type="text/javascript" src="heartbeat/jsknockoutorderable"></script>
-<script defer type="text/javascript" src="heartbeat/jsnumeral"></script>
-<script defer type="text/javascript" src="heartbeat/jspage"></script>
+<link rel="stylesheet" type="text/css" href="heartbeat/styles.css" />
+<script defer type="application/javascript" src="heartbeat/knockout.js"></script>
+<script defer type="application/javascript" src="heartbeat/knockoutorderable.js"></script>
+<script defer type="application/javascript" src="heartbeat/numeral.js"></script>
+<script defer type="application/javascript" src="heartbeat/page.js"></script>
 
 <div class="row">
     <div class="col-md-6">

diff --git a/src/Hangfire.Heartbeat/Hangfire.Heartbeat.csproj b/src/Hangfire.Heartbeat/Hangfire.Heartbeat.csproj
@@ -4,21 +4,19 @@
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.5.0</Version>
     <PackageId>Hangfire.Heartbeat</PackageId>
     <AssemblyTitle>Hangfire.Heartbeat</AssemblyTitle>
     <Product>Hangfire.Heartbeat</Product>
-    <Company>ahydrax</Company>
-    <Copyright>Copyright © 2018-present Hangfire.Heartbeat contributors</Copyright>
+    <Company>Hangfire.Heartbeat contributors</Company>
+    <Copyright>Copyright © 2021 Hangfire.Heartbeat contributors</Copyright>
     <Description>Server monitoring plugin for Hangfire.</Description>
-    <Authors>ahydrax</Authors>
-    <PackageDescription>Server monitoring plugin for Hangfire.</PackageDescription>
+    <Authors>Hangfire.Heartbeat contributors</Authors>
+    <PackageDescription>Hangfire server/process monitoring plugin.</PackageDescription>
     <PackageReleaseNotes>https://github.com/ahydrax/Hangfire.Heartbeat/releases</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/ahydrax/Hangfire.Heartbeat</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/ahydrax/Hangfire.Heartbeat/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/tests/Hangfire.Heartbeat.TestApplication/Hangfire.Heartbeat.TestApplication.csproj b/tests/Hangfire.Heartbeat.TestApplication/Hangfire.Heartbeat.TestApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +12,6 @@
     <PackageReference Include="Hangfire" Version="1.7.2" />
     <PackageReference Include="HangFire.Core" Version="1.7.2" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Hangfire.Heartbeat.TestApplication/Startup.cs b/tests/Hangfire.Heartbeat.TestApplication/Startup.cs
@@ -30,7 +30,7 @@ public void ConfigureServices(IServiceCollection services)
                     .UseHeartbeatPage(TimeSpan.FromMilliseconds(500)));
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.UseDeveloperExceptionPage();