Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
<PackageVersion Include="Kuddle.Net.Extensions.Configuration" Version="0.8.0" />
<PackageVersion Include="LiteDB" Version="5.0.21" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageVersion
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="10.0.7"
Version="10.0.9"
/>
<PackageVersion
Include="Microsoft.Extensions.Options.ConfigurationExtensions"
Version="10.0.7"
Version="10.0.9"
/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.5.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.7.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.8.0" />
<PackageVersion Include="MinVer" Version="7.0.0" />
<PackageVersion Include="ModularPipelines" Version="3.1.90" />
<PackageVersion Include="Moq" Version="4.20.72" />
Expand All @@ -43,17 +43,17 @@
<PackageVersion Include="Serilog" Version="4.3.1" />
<PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.1" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Spectre.Console" Version="0.55.2" />
<PackageVersion Include="Stanza.TerminalGui" Version="0.1.0-preview.8" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
<PackageVersion Include="Terminal.Gui" Version="2.4.3" />
<PackageVersion Include="Velopack" Version="0.0.1298" />
<PackageVersion Include="Spectre.Console" Version="0.57.1" />
<PackageVersion Include="Stanza.TerminalGui" Version="0.1.1-preview.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.19.1" />
<PackageVersion Include="Terminal.Gui" Version="2.4.11" />
<PackageVersion Include="Velopack" Version="1.2.0" />
<PackageVersion Include="Vogen" Version="8.0.5" />
<PackageVersion Include="Xdg.Directories" Version="0.1.2" />
<PackageVersion Include="Imposter" Version="0.1.9" />
<PackageVersion Include="TUnit" Version="1.41.0" />
<PackageVersion Include="TUnit" Version="1.56.35" />
</ItemGroup>
</Project>
38 changes: 5 additions & 33 deletions src/Typical/Infrastructure/StartupTasks.cs
Original file line number Diff line number Diff line change
@@ -1,47 +1,19 @@
using System.Text.Json;

using DotNetPathUtils;

using Microsoft.Extensions.Logging;
using NuGet.Versioning;

using Typical.Configuration;

using Velopack;
using Velopack.Locators;
using Velopack.Logging;

namespace Typical.Infrastructure;

public static class StartupTasks
{
private static JsonSerializerOptions JsonOptions { get; } =
new JsonSerializerOptions { WriteIndented = true };

internal static void Install(SemanticVersion? v = null)
{
var locator = VelopackLocator.CreateDefaultForPlatform();

var logger = locator.Log;

var installDir = locator.RootAppDir is not null
? Path.Combine(locator.RootAppDir, "current")
: AppDomain.CurrentDomain.BaseDirectory;

logger.Debug($"Adding path to $env.PATH: {installDir} ");

var result = new PathEnvironmentHelper().EnsureDirectoryIsInPath(installDir!);

logger.Info($"Add path result: {result.Status}");
}

internal static void Uninstall(SemanticVersion? v = null)
{
var logger = VelopackLocator.CreateDefaultForPlatform().Log;
logger.Info("Performing installation tasks...");
logger.Info("Cleaning up path...");

var appDir = Path.GetDirectoryName(AppContext.BaseDirectory)!;
var result = new PathEnvironmentHelper().RemoveDirectoryFromPath(appDir);

logger.Info($"Remove from path result: {result.Status}");
}

public static async Task InitializeAsync(ILogger? logger = null)
{
var configPath = Path.Combine(AppPaths.ConfigHome, "config.json");
Expand Down
2 changes: 1 addition & 1 deletion src/Typical/Typical.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Spectre.Console" />
<PackageReference Include="Stanza.TerminalGui" PrivateAssets="all" />
<PackageReference Include="Stanza.TerminalGui" />
<PackageReference Include="Terminal.Gui" />
<TrimmerRootAssembly Include="Terminal.Gui" />
<PackageReference Include="Velopack" />
Expand Down