Compare commits

...

4 Commits

Author SHA1 Message Date
Matija Koželj
3616eb62ea Set package dependency resolution to max version instead of min version 2023-01-31 13:14:58 +01:00
Matija Koželj
3dc20a9325 Add check for application shutdown when waiting for debugger 2023-01-05 14:26:47 +01:00
Matija Koželj
9d22093165 Add support for tool paths 2023-01-04 16:15:16 +01:00
Matija Koželj
4d5c93f094 Change reference paths to application base instead of executingassembly 2023-01-04 16:01:49 +01:00
3 changed files with 7 additions and 4 deletions

View File

@ -18,7 +18,7 @@ internal sealed class ConnectedPlatformService : BackgroundService
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
if (GlobalConfig.GetValue<bool>("waitForDebugger"))
while (!Debugger.IsAttached)
while (!Debugger.IsAttached && !stoppingToken.IsCancellationRequested)
await Task.Delay(500);
await DependencyLoader.LoadPackages(Config.MicroServices, Config.Repositories);

View File

@ -84,7 +84,7 @@ public class DependencyLoader
/*
* Install packages in standard location.
*/
var packageDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, ".packages");
var packageDirectory = Path.GetFullPath(".packages");
var nugetSettings = Settings.LoadDefaultSettings(packageDirectory);
@ -286,7 +286,7 @@ public class DependencyLoader
foreach (var dependency in sourceDependencies.Dependencies)
{
await GetPackageDependencies(
new PackageIdentity(dependency.Id, dependency.VersionRange.MinVersion),
new PackageIdentity(dependency.Id, dependency.VersionRange.MaxVersion),
cacheContext,
framework,
logger,

View File

@ -13,7 +13,7 @@ namespace Connected.Host
{
cfg.AddCommandLine(args);
var appPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var appPath = AppContext.BaseDirectory;
var segments = new Uri(appPath).Segments;
segments = segments.Select(e => e.Replace("%20", " ")).ToArray();
@ -30,6 +30,9 @@ namespace Connected.Host
}
}
if(File.Exists(Path.GetFullPath("./sys.json")))
cfg.AddJsonFile("./sys.json", true, false);
cfg.AddEnvironmentVariables();
})
.ConfigureServices((context, services) =>