Skip to content

Prepare BionicMonitor 1.0.21 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doyleyoung merged 2 commits into from
Dec 6, 2019
Merged

Prepare BionicMonitor 1.0.21 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
113dbf4
Prepare BionicMonitor 1.0.21
bmsantos Dec 6, 2019
6d1f954
Simplify code and allow for more standard directories to be monitored.
bmsantos Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BionicMonitor/BionicMonitor.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 11 additions & 15 deletions BionicMonitorService/BionicMonitorService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using BionicMonitorService.Hubs;
using BionicMonitorService.Options;
Expand Down Expand Up @@ -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"));
Expand Down
2 changes: 1 addition & 1 deletion BionicMonitorService/BionicMonitorService.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down