diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj
index a125c6c5e1..a73ecd99e6 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
diff --git a/samples/DashboardDemo/src/DashboardDemo.DbMigrator/DashboardDemo.DbMigrator.csproj b/samples/DashboardDemo/src/DashboardDemo.DbMigrator/DashboardDemo.DbMigrator.csproj
index 5c92b934a5..be7292425f 100644
--- a/samples/DashboardDemo/src/DashboardDemo.DbMigrator/DashboardDemo.DbMigrator.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.DbMigrator/DashboardDemo.DbMigrator.csproj
@@ -4,14 +4,11 @@
Exe
- netcoreapp2.2
+ netcoreapp3.0
-
-
-
PreserveNewest
Always
@@ -19,7 +16,7 @@
-
+
diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj
index 3270a18c33..7dd33d22f9 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj
index 082b06c5d2..1b3fb490eb 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj
index 53f93f3a4b..aea0c73e17 100644
--- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
diff --git a/samples/DashboardDemo/src/DashboardDemo.HttpApi.Client/DashboardDemo.HttpApi.Client.csproj b/samples/DashboardDemo/src/DashboardDemo.HttpApi.Client/DashboardDemo.HttpApi.Client.csproj
index c93e7e7a40..89717376ed 100644
--- a/samples/DashboardDemo/src/DashboardDemo.HttpApi.Client/DashboardDemo.HttpApi.Client.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.HttpApi.Client/DashboardDemo.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
- netstandard2.0
+ netcoreapp3.0
DashboardDemo
diff --git a/samples/DashboardDemo/src/DashboardDemo.HttpApi/DashboardDemo.HttpApi.csproj b/samples/DashboardDemo/src/DashboardDemo.HttpApi/DashboardDemo.HttpApi.csproj
index e68a644128..fb27bdb91c 100644
--- a/samples/DashboardDemo/src/DashboardDemo.HttpApi/DashboardDemo.HttpApi.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.HttpApi/DashboardDemo.HttpApi.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj
index 17943ee878..b7d55edcc6 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj
+++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
InProcess
DashboardDemo.Web
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
@@ -12,6 +12,7 @@
true
true
false
+ true
@@ -31,12 +32,10 @@
-
-
-
+
diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs
index ae53dd9150..c599ee0ac4 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs
+++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
using DashboardDemo.EntityFrameworkCore;
using DashboardDemo.Localization;
using DashboardDemo.MultiTenancy;
@@ -109,7 +110,7 @@ namespace DashboardDemo.Web
});
}
- private void ConfigureVirtualFileSystem(IHostingEnvironment hostingEnvironment)
+ private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment)
{
if (hostingEnvironment.IsDevelopment())
{
@@ -186,6 +187,7 @@ namespace DashboardDemo.Web
}
app.UseVirtualFiles();
+ app.UseRouting();
app.UseAuthentication();
app.UseJwtTokenMiddleware();
@@ -196,11 +198,12 @@ namespace DashboardDemo.Web
app.UseIdentityServer();
app.UseAbpRequestLocalization();
- app.UseSwagger();
- app.UseSwaggerUI(options =>
- {
- options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API");
- });
+ //Swagger does not support ASP.NET Core 3.0 yet
+ //app.UseSwagger();
+ //app.UseSwaggerUI(options =>
+ //{
+ // options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API");
+ //});
app.UseAuditing();
app.UseMvcWithDefaultRouteAndArea();
}
diff --git a/samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemo.Application.Tests.csproj b/samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemo.Application.Tests.csproj
index fb50c96f63..d9fc57b897 100644
--- a/samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemo.Application.Tests.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemo.Application.Tests.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
@@ -13,7 +13,7 @@
-
+
diff --git a/samples/DashboardDemo/test/DashboardDemo.Domain.Tests/DashboardDemo.Domain.Tests.csproj b/samples/DashboardDemo/test/DashboardDemo.Domain.Tests/DashboardDemo.Domain.Tests.csproj
index de3334ff07..83194673d8 100644
--- a/samples/DashboardDemo/test/DashboardDemo.Domain.Tests/DashboardDemo.Domain.Tests.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.Domain.Tests/DashboardDemo.Domain.Tests.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/DashboardDemo/test/DashboardDemo.EntityFrameworkCore.Tests/DashboardDemo.EntityFrameworkCore.Tests.csproj b/samples/DashboardDemo/test/DashboardDemo.EntityFrameworkCore.Tests/DashboardDemo.EntityFrameworkCore.Tests.csproj
index ade2357433..55560ebe5f 100644
--- a/samples/DashboardDemo/test/DashboardDemo.EntityFrameworkCore.Tests/DashboardDemo.EntityFrameworkCore.Tests.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.EntityFrameworkCore.Tests/DashboardDemo.EntityFrameworkCore.Tests.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
@@ -13,9 +13,9 @@
-
-
-
+
+
+
diff --git a/samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/DashboardDemo.HttpApi.Client.ConsoleTestApp.csproj b/samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/DashboardDemo.HttpApi.Client.ConsoleTestApp.csproj
index 5f8aa3e268..372d378fff 100644
--- a/samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/DashboardDemo.HttpApi.Client.ConsoleTestApp.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/DashboardDemo.HttpApi.Client.ConsoleTestApp.csproj
@@ -2,14 +2,11 @@
Exe
- netcoreapp2.2
+ netcoreapp3.0
-
-
-
PreserveNewest
Always
diff --git a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemo.TestBase.csproj b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemo.TestBase.csproj
index c5e1b6a40d..64a64305c9 100644
--- a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemo.TestBase.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemo.TestBase.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
DashboardDemo
@@ -15,7 +15,7 @@
-
+
diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemo.Web.Tests.csproj b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemo.Web.Tests.csproj
index 2006a283e1..5bdd1e0926 100644
--- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemo.Web.Tests.csproj
+++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemo.Web.Tests.csproj
@@ -3,7 +3,7 @@
- netcoreapp2.2
+ netcoreapp3.0
Exe
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
DashboardDemo
@@ -14,7 +14,7 @@
-
+