Compare commits

..

No commits in common. "3616eb62eae5d50bc8e90b0868f09b35e01d168c" and "3ff30ea1fd638e2c14b7361d1a93eb458c2564a4" have entirely different histories.

3 changed files with 4 additions and 7 deletions

View File

@ -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 && !stoppingToken.IsCancellationRequested) while (!Debugger.IsAttached)
await Task.Delay(500); await Task.Delay(500);
await DependencyLoader.LoadPackages(Config.MicroServices, Config.Repositories); await DependencyLoader.LoadPackages(Config.MicroServices, Config.Repositories);

View File

@ -84,7 +84,7 @@ public class DependencyLoader
/* /*
* Install packages in standard location. * Install packages in standard location.
*/ */
var packageDirectory = Path.GetFullPath(".packages"); var packageDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, ".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.MaxVersion), new PackageIdentity(dependency.Id, dependency.VersionRange.MinVersion),
cacheContext, cacheContext,
framework, framework,
logger, logger,

View File

@ -13,7 +13,7 @@ namespace Connected.Host
{ {
cfg.AddCommandLine(args); cfg.AddCommandLine(args);
var appPath = AppContext.BaseDirectory; var appPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
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,9 +30,6 @@ 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) =>