diff --git a/nupkg/Volo.Abp.Account.Web.0.2.0/Volo.Abp.Account.Web.nuspec b/nupkg/Volo.Abp.Account.Web.0.2.0/Volo.Abp.Account.Web.nuspec
new file mode 100644
index 0000000000..2bf0bd8c58
--- /dev/null
+++ b/nupkg/Volo.Abp.Account.Web.0.2.0/Volo.Abp.Account.Web.nuspec
@@ -0,0 +1,27 @@
+
+
+
+ Volo.Abp.Account.Web
+ 0.2.0
+ Volo.Abp.Account.Web
+ Volo.Abp.Account.Web
+ false
+ https://github.com/aspnetzero/abp/blob/master/LICENSE
+ http://abp.io/
+ http://www.aspnetboilerplate.com/images/abp_nupkg.png
+ Package Description
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nupkg/Volo.Abp.Account.Web.0.2.0/[Content_Types].xml b/nupkg/Volo.Abp.Account.Web.0.2.0/[Content_Types].xml
new file mode 100644
index 0000000000..d394e3b02f
--- /dev/null
+++ b/nupkg/Volo.Abp.Account.Web.0.2.0/[Content_Types].xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nupkg/Volo.Abp.Account.Web.0.2.0/_rels/.rels b/nupkg/Volo.Abp.Account.Web.0.2.0/_rels/.rels
new file mode 100644
index 0000000000..e5d1dd8eb3
--- /dev/null
+++ b/nupkg/Volo.Abp.Account.Web.0.2.0/_rels/.rels
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/nupkg/Volo.Abp.Account.Web.0.2.0/content/Pages/Account/Login.cshtml b/nupkg/Volo.Abp.Account.Web.0.2.0/content/Pages/Account/Login.cshtml
new file mode 100644
index 0000000000..de098fa3f9
--- /dev/null
+++ b/nupkg/Volo.Abp.Account.Web.0.2.0/content/Pages/Account/Login.cshtml
@@ -0,0 +1,45 @@
+@page
+@model Volo.Abp.Account.Web.Pages.Account.LoginModel
+
+
+
+ @if (Model.ExternalLogins.Any())
+ {
+
+
Use another service to log in.
+
+
+ }
+
+
+
+
+ @if (Model.ExternalLogins.Any())
+ {
+
+
Use another service to log in.
+
+
+ }
+
+
+
+
+
+ Login
+
+
+
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/Index.cshtml.cs b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/Index.cshtml.cs
new file mode 100644
index 0000000000..0148f298da
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/Index.cshtml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace MicroserviceDemo.Web.Pages
+{
+ public class IndexModel : PageModel
+ {
+ public void OnGet()
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewImports.cshtml b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..05e1baf060
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewStart.cshtml b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewStart.cshtml
new file mode 100644
index 0000000000..f4d75cd962
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Pages/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+ Layout = "~/Views/Shared/_AppLayout.cshtml";
+}
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Program.cs b/samples/MicroserviceDemo/MicroserviceDemo.Web/Program.cs
index 483fab51ee..6bcf14a1b8 100644
--- a/samples/MicroserviceDemo/MicroserviceDemo.Web/Program.cs
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using System.IO;
using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
namespace MicroserviceDemo.Web
{
@@ -14,11 +7,14 @@ namespace MicroserviceDemo.Web
{
public static void Main(string[] args)
{
- BuildWebHost(args).Run();
+ BuildWebHostInternal(args).Run();
}
- public static IWebHost BuildWebHost(string[] args) =>
- WebHost.CreateDefaultBuilder(args)
+ public static IWebHost BuildWebHostInternal(string[] args) =>
+ new WebHostBuilder()
+ .UseKestrel()
+ .UseContentRoot(Directory.GetCurrentDirectory())
+ .UseIISIntegration()
.UseStartup()
.Build();
}
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Startup.cs b/samples/MicroserviceDemo/MicroserviceDemo.Web/Startup.cs
index 4c22f392d7..c904f49d1a 100644
--- a/samples/MicroserviceDemo/MicroserviceDemo.Web/Startup.cs
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Startup.cs
@@ -1,27 +1,36 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
+using System;
+using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Volo.Abp;
namespace MicroserviceDemo.Web
{
public class Startup
{
- public void ConfigureServices(IServiceCollection services)
+ public IServiceProvider ConfigureServices(IServiceCollection services)
{
+ services.AddApplication(options =>
+ {
+ options.UseAutofac();
+ });
+
+ return services.BuildServiceProviderFromFactory();
}
- public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
{
- if (env.IsDevelopment())
- {
- app.UseDeveloperExceptionPage();
- }
+ loggerFactory
+ .AddConsole()
+ .AddDebug()
+ .AddSerilog(new LoggerConfiguration()
+ .Enrich.FromLogContext()
+ .WriteTo.RollingFile("Logs/logs.txt")
+ .CreateLogger()
+ );
- app.Run(async (context) =>
- {
- await context.Response.WriteAsync("Hello microservices!");
- });
+ app.InitializeApplication();
}
}
}
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewImports.cshtml b/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..05e1baf060
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewStart.cshtml b/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..f4d75cd962
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+ Layout = "~/Views/Shared/_AppLayout.cshtml";
+}
diff --git a/samples/MicroserviceDemo/MicroserviceDemo.Web/appsettings.json b/samples/MicroserviceDemo/MicroserviceDemo.Web/appsettings.json
new file mode 100644
index 0000000000..38342d3685
--- /dev/null
+++ b/samples/MicroserviceDemo/MicroserviceDemo.Web/appsettings.json
@@ -0,0 +1,6 @@
+{
+ "ConnectionStrings": {
+ "Default": "Server=localhost;Database=MicroservicesDemo.Web;Trusted_Connection=True;MultipleActiveResultSets=true",
+ "AbpPermissions": "Server=localhost;Database=MicroservicesDemo.Permissions;Trusted_Connection=True;MultipleActiveResultSets=true"
+ }
+}
\ No newline at end of file
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
index efb68e61ec..4aa15c75fd 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@@ -60,7 +60,7 @@ namespace AbpDesk.Web.Mvc
services.PreConfigure(builder =>
{
builder
- .AddViewLocalization()
+ .AddViewLocalization() //TODO: Move to the framework!
.AddRazorPagesOptions(options =>
{
options.Conventions.AuthorizeFolder("/App");
@@ -122,6 +122,7 @@ namespace AbpDesk.Web.Mvc
services.Configure(options =>
{
+ //TODO: To the framework!
options.ScriptBundles.Add("GlobalScripts", new[]
{
"/Abp/ApplicationConfigurationScript?_v=" + DateTime.Now.Ticks,
diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
index d0eeba87e2..22a5b18a05 100644
--- a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
+++ b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
@@ -7,6 +7,8 @@ using Volo.Abp.VirtualFileSystem;
namespace Microsoft.AspNetCore.Builder
{
+ //TODO: Volo.Abp.AspNetCore.EmbeddedFiles package should be referenced by the projects using embedded resources..?
+
public static class VirtualFileSystemApplicationBuilderExtensions
{
public static void UseVirtualFiles(this IApplicationBuilder app)
diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxyScriptController.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxyScriptController.cs
index 0ebee057bf..fa3100debb 100644
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxyScriptController.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ProxyScripting/AbpServiceProxyScriptController.cs
@@ -16,6 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ProxyScripting
_proxyScriptManager = proxyScriptManager;
}
+ [HttpGet]
[Produces("text/javascript", "text/plain")]
public string GetAll(ServiceProxyGenerationModel model)
{