Compare commits
4 Commits
3ff30ea1fd
...
3616eb62ea
Author | SHA1 | Date | |
---|---|---|---|
![]() |
3616eb62ea | ||
![]() |
3dc20a9325 | ||
![]() |
9d22093165 | ||
![]() |
4d5c93f094 |
@ -18,7 +18,7 @@ internal sealed class ConnectedPlatformService : BackgroundService
|
|||||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
{
|
{
|
||||||
if (GlobalConfig.GetValue<bool>("waitForDebugger"))
|
if (GlobalConfig.GetValue<bool>("waitForDebugger"))
|
||||||
while (!Debugger.IsAttached)
|
while (!Debugger.IsAttached && !stoppingToken.IsCancellationRequested)
|
||||||
await Task.Delay(500);
|
await Task.Delay(500);
|
||||||
|
|
||||||
await DependencyLoader.LoadPackages(Config.MicroServices, Config.Repositories);
|
await DependencyLoader.LoadPackages(Config.MicroServices, Config.Repositories);
|
||||||
|
@ -84,7 +84,7 @@ public class DependencyLoader
|
|||||||
/*
|
/*
|
||||||
* Install packages in standard location.
|
* 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);
|
var nugetSettings = Settings.LoadDefaultSettings(packageDirectory);
|
||||||
|
|
||||||
@ -286,7 +286,7 @@ public class DependencyLoader
|
|||||||
foreach (var dependency in sourceDependencies.Dependencies)
|
foreach (var dependency in sourceDependencies.Dependencies)
|
||||||
{
|
{
|
||||||
await GetPackageDependencies(
|
await GetPackageDependencies(
|
||||||
new PackageIdentity(dependency.Id, dependency.VersionRange.MinVersion),
|
new PackageIdentity(dependency.Id, dependency.VersionRange.MaxVersion),
|
||||||
cacheContext,
|
cacheContext,
|
||||||
framework,
|
framework,
|
||||||
logger,
|
logger,
|
||||||
|
@ -13,7 +13,7 @@ namespace Connected.Host
|
|||||||
{
|
{
|
||||||
cfg.AddCommandLine(args);
|
cfg.AddCommandLine(args);
|
||||||
|
|
||||||
var appPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
var appPath = AppContext.BaseDirectory;
|
||||||
var segments = new Uri(appPath).Segments;
|
var segments = new Uri(appPath).Segments;
|
||||||
|
|
||||||
segments = segments.Select(e => e.Replace("%20", " ")).ToArray();
|
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();
|
cfg.AddEnvironmentVariables();
|
||||||
})
|
})
|
||||||
.ConfigureServices((context, services) =>
|
.ConfigureServices((context, services) =>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user