From 113dbf415db2d17cf01e96c8a4125edcfa9b6caa Mon Sep 17 00:00:00 2001
From: Bruno Santos <bmrosantos@gmail.com>
Date: Fri, 6 Dec 2019 10:28:29 -0500
Subject: [PATCH 1/2] Prepare BionicMonitor 1.0.21

Issue #9
---
 BionicMonitor/BionicMonitor.nuspec               | 2 +-
 BionicMonitorService/BionicMonitorService.nuspec | 2 +-
 Directory.Build.props                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BionicMonitor/BionicMonitor.nuspec b/BionicMonitor/BionicMonitor.nuspec
index 930e4db..0a9d99e 100644
--- a/BionicMonitor/BionicMonitor.nuspec
+++ b/BionicMonitor/BionicMonitor.nuspec
@@ -6,7 +6,7 @@
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
-    <licenseUrl>https://raw.githubusercontent.com/BionicFramework/BionicCLI/master/LICENSE</licenseUrl>
+    <license>https://raw.githubusercontent.com/BionicFramework/BionicCLI/master/LICENSE</license>
     <projectUrl>https://github.com/BionicFramework/BionicMonitor</projectUrl>
     <iconUrl>https://vectr.com/bmsantos/a2sGndBV8e.svg?width=256&amp;height=256&amp;select=a2sGndBV8epage0</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/BionicMonitorService/BionicMonitorService.nuspec b/BionicMonitorService/BionicMonitorService.nuspec
index 9436c01..400fe66 100644
--- a/BionicMonitorService/BionicMonitorService.nuspec
+++ b/BionicMonitorService/BionicMonitorService.nuspec
@@ -6,7 +6,7 @@
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>
-        <licenseUrl>https://raw.githubusercontent.com/BionicFramework/BionicCLI/master/LICENSE</licenseUrl>
+        <license>https://raw.githubusercontent.com/BionicFramework/BionicCLI/master/LICENSE</license>
         <projectUrl>https://github.com/BionicFramework/BionicMonitor</projectUrl>
         <iconUrl>https://vectr.com/bmsantos/a2sGndBV8e.svg?width=256&amp;height=256&amp;select=a2sGndBV8epage0</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/Directory.Build.props b/Directory.Build.props
index 677ceb1..732c890 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -38,7 +38,7 @@
 
   <!-- Versioning properties -->
   <PropertyGroup>
-    <VersionPrefix Condition=" '$(VersionPrefix)'=='' ">1.0.20</VersionPrefix>
+    <VersionPrefix Condition=" '$(VersionPrefix)'=='' ">1.0.21</VersionPrefix>
     <VersionSuffix Condition=" '$(VersionSuffix)'=='' ">dev</VersionSuffix>
   </PropertyGroup>
 

From 6d1f954c6d0b44d815d6871779b39be59010664b Mon Sep 17 00:00:00 2001
From: Bruno Santos <bmrosantos@gmail.com>
Date: Fri, 6 Dec 2019 10:51:26 -0500
Subject: [PATCH 2/2] Simplify code and allow for more standard directories to
 be monitored.

Issue #7
---
 BionicMonitorService/BionicMonitorService.cs | 26 +++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/BionicMonitorService/BionicMonitorService.cs b/BionicMonitorService/BionicMonitorService.cs
index 794bae1..721bf8f 100644
--- a/BionicMonitorService/BionicMonitorService.cs
+++ b/BionicMonitorService/BionicMonitorService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using BionicMonitorService.Hubs;
 using BionicMonitorService.Options;
@@ -39,26 +40,21 @@ IApplicationLifetime applicationLifetime
         childAppBuilder.UseSpa(spa => spa.Options.DefaultPageStaticFileOptions = staticFileOptions);
       });
 
-      var distPath = Path.Combine(Directory.GetCurrentDirectory(), "bin/Debug/netstandard2.1/dist");
-      if (Directory.Exists(distPath)) {
+      var distPaths = new List<string>() { "3.1", "3.0", "2.1", "2.0" };
+      var foundDistPath = false;
+      distPaths.ForEach(netStdVersion => {
+        var distPath = Path.Combine(Directory.GetCurrentDirectory(), $"bin/Debug/netstandard{netStdVersion}/dist");
+        if (!Directory.Exists(distPath)) return;
         app.UseStaticFiles(new StaticFileOptions {
           FileProvider = new PhysicalFileProvider(distPath),
           ContentTypeProvider = CreateContentTypeProvider(),
           OnPrepareResponse = SetCacheHeaders
         });
-      }
-      else {
-        distPath = Path.Combine(Directory.GetCurrentDirectory(), "bin/Debug/netstandard2.0/dist");
-        if (Directory.Exists(distPath)) {
-          app.UseStaticFiles(new StaticFileOptions {
-            FileProvider = new PhysicalFileProvider(distPath),
-            ContentTypeProvider = CreateContentTypeProvider(),
-            OnPrepareResponse = SetCacheHeaders
-          });
-        }
-        else {
-          Console.WriteLine($"💀 Bionic Monitor was unable to find a netstandard (2.0 or 2.1) build directory. Please build project and restart Bionic Monitor.");
-        }
+        foundDistPath = true;
+      });
+
+      if (!foundDistPath) {
+        Console.WriteLine("💀 Bionic Monitor was unable to find a netstandard (3.1, 3.0, 2.1 or 2.0) build directory. Please build project and restart Bionic Monitor.");
       }
 
       app.UseSignalR(routes => routes.MapHub<ReloadHub>("/reloadHub"));