Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Charles Nurse
2021-04-19 11:08:35 -07:00
112 changed files with 1696 additions and 1232 deletions

View File

@ -227,7 +227,7 @@ namespace Oqtane
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ISyncManager sync)
{
ServiceActivator.Configure(app.ApplicationServices);
@ -265,6 +265,9 @@ namespace Oqtane
endpoints.MapControllers();
endpoints.MapFallbackToPage("/_Host");
});
// create a sync event to identify server application startup
sync.AddSyncEvent(-1, "Application", -1);
}
}
}