Skip to content

Commit 981172e

Browse files
andreylepikhovandreylepikhov
committed
auto sync for version 2023.1
1 parent c3929fe commit 981172e

12 files changed

+151
-157
lines changed

‎CS/AspNetCoreDashboard/AspNetCoreDashboard.csproj

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk.Web">
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
6-
<Nullable>enable</Nullable><ImplicitUsings>enable</ImplicitUsings>
7-
8-
</PropertyGroup>
9-
<ItemGroup>
10-
11-
<PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="22.2.2" /><PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" /><PackageReference Include="BuildBundlerMinifier" Version="3.2.449" /><PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" /></ItemGroup>
12-
<ItemGroup>
13-
<Compile Remove="node_modules\**" />
14-
<Content Remove="node_modules\**" />
15-
<EmbeddedResource Remove="node_modules\**" />
16-
<None Remove="node_modules\**" />
17-
</ItemGroup>
18-
<Target Name="DebugEnsureNodeEnv" BeforeTargets="LibraryManagerRestore" Condition=" '$(Configuration)' == 'Debug' And !Exists('node_modules') ">
19-
<!-- Ensure Node.js is installed -->
20-
<Exec Command="node --version" ContinueOnError="true">
21-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
22-
</Exec>
23-
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
24-
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
25-
<Exec WorkingDirectory="." Command="npm install" />
26-
</Target>
27-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk.Web">
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="23.1.*-*" />
10+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
11+
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
12+
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.113" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<Compile Remove="node_modules\**" />
16+
<Content Remove="node_modules\**" />
17+
<EmbeddedResource Remove="node_modules\**" />
18+
<None Remove="node_modules\**" />
19+
</ItemGroup>
20+
<Target Name="DebugEnsureNodeEnv" BeforeTargets="LibraryManagerRestore" Condition=" '$(Configuration)' == 'Debug' And !Exists('node_modules') ">
21+
<!-- Ensure Node.js is installed -->
22+
<Exec Command="node --version" ContinueOnError="true">
23+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
24+
</Exec>
25+
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
26+
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
27+
<Exec WorkingDirectory="." Command="npm install" />
28+
</Target>
29+
</Project>

‎CS/AspNetCoreDashboard/Code/DashboardUtils.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
using DevExpress.DashboardAspNetCore;
2-
using DevExpress.DashboardWeb;
3-
using Microsoft.Extensions.FileProviders;
4-
using AspNetCoreDashboard.Storages;
5-
6-
namespace AspNetCoreDashboard {
7-
public static class DashboardUtils {
8-
public static DashboardConfigurator CreateDashboardConfigurator(IConfiguration configuration, IFileProvider fileProvider) {
9-
DashboardConfigurator configurator = new DashboardConfigurator();
10-
configurator.SetConnectionStringsProvider(new DashboardConnectionStringsProvider(configuration));
11-
12-
DashboardFileStorage dashboardFileStorage = new CustomDashboardFileStorage(@"Data/Dashboards");
13-
configurator.SetDashboardStorage(dashboardFileStorage);
14-
15-
return configurator;
16-
}
17-
}
18-
}
1+
using DevExpress.DashboardAspNetCore;
2+
using DevExpress.DashboardWeb;
3+
using Microsoft.Extensions.FileProviders;
4+
using AspNetCoreDashboard.Storages;
5+
6+
namespace AspNetCoreDashboard {
7+
public static class DashboardUtils {
8+
public static DashboardConfigurator CreateDashboardConfigurator(IConfiguration configuration, IFileProvider fileProvider) {
9+
DashboardConfigurator configurator = new DashboardConfigurator();
10+
configurator.SetConnectionStringsProvider(new DashboardConnectionStringsProvider(configuration));
11+
12+
DashboardFileStorage dashboardFileStorage = new CustomDashboardFileStorage(@"Data/Dashboards");
13+
configurator.SetDashboardStorage(dashboardFileStorage);
14+
15+
return configurator;
16+
}
17+
}
18+
}

‎CS/AspNetCoreDashboard/Controllers/DefaultDashboardController.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using DevExpress.DashboardAspNetCore;
2-
using DevExpress.DashboardWeb;
3-
using Microsoft.AspNetCore.DataProtection;
4-
5-
namespace AspNetCoreDashboard.Controllers {
6-
public class DefaultDashboardController : DashboardController {
7-
public DefaultDashboardController(DashboardConfigurator configurator, IDataProtectionProvider? dataProtectionProvider = null)
8-
: base(configurator, dataProtectionProvider) {
9-
}
10-
}
11-
}
1+
using DevExpress.DashboardAspNetCore;
2+
using DevExpress.DashboardWeb;
3+
using Microsoft.AspNetCore.DataProtection;
4+
5+
namespace AspNetCoreDashboard.Controllers {
6+
public class DefaultDashboardController : DashboardController {
7+
public DefaultDashboardController(DashboardConfigurator configurator, IDataProtectionProvider? dataProtectionProvider = null)
8+
: base(configurator, dataProtectionProvider) {
9+
}
10+
}
11+
}

‎CS/AspNetCoreDashboard/Controllers/HomeController.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
using AspNetCoreDashboard.Storages;
2-
using Microsoft.AspNetCore.Mvc;
3-
4-
namespace AspNetCoreDashboard.Controllers {
5-
public class HomeController : Controller {
6-
public ActionResult Index() {
7-
return View();
8-
}
9-
public ActionResult DeleteDashboard(string DashboardID) {
10-
CustomDashboardFileStorage newDashboardStorage = new CustomDashboardFileStorage(@"Data/Dashboards");
11-
newDashboardStorage.DeleteDashboard(DashboardID);
12-
return new EmptyResult();
13-
}
14-
}
15-
}
1+
using AspNetCoreDashboard.Storages;
2+
using Microsoft.AspNetCore.Mvc;
3+
4+
namespace AspNetCoreDashboard.Controllers {
5+
public class HomeController : Controller {
6+
public ActionResult Index() {
7+
return View();
8+
}
9+
public ActionResult DeleteDashboard(string DashboardID) {
10+
CustomDashboardFileStorage newDashboardStorage = new CustomDashboardFileStorage(@"Data/Dashboards");
11+
newDashboardStorage.DeleteDashboard(DashboardID);
12+
return new EmptyResult();
13+
}
14+
}
15+
}

‎CS/AspNetCoreDashboard/NuGet.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎CS/AspNetCoreDashboard/Program.cs

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
using DevExpress.AspNetCore;
2-
using DevExpress.DashboardAspNetCore;
3-
using DevExpress.DashboardWeb;
4-
using Microsoft.Extensions.FileProviders;
5-
using AspNetCoreDashboard;
6-
7-
var builder = WebApplication.CreateBuilder(args);
8-
9-
IFileProvider? fileProvider = builder.Environment.ContentRootFileProvider;
10-
IConfiguration? configuration = builder.Configuration;
11-
12-
// Add services to the container.
13-
builder.Services.AddControllersWithViews();
14-
builder.Services.AddRazorPages();
15-
16-
builder.Services.AddDevExpressControls();
17-
builder.Services.AddScoped<DashboardConfigurator>((IServiceProvider serviceProvider) => {
18-
return DashboardUtils.CreateDashboardConfigurator(configuration, fileProvider);
19-
});
20-
21-
var app = builder.Build();
22-
23-
24-
// Configure the HTTP request pipeline.
25-
if (!app.Environment.IsDevelopment())
26-
{
27-
app.UseExceptionHandler("/Home/Error");
28-
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
29-
app.UseHsts();
30-
}
31-
32-
app.UseHttpsRedirection();
33-
app.UseStaticFiles();
34-
35-
app.UseDevExpressControls();
36-
37-
app.UseRouting();
38-
39-
app.UseAuthorization();
40-
app.MapRazorPages();
41-
app.MapDashboardRoute("dashboardControl", "DefaultDashboard");
42-
app.MapDefaultControllerRoute();
43-
44-
app.Run();
45-
1+
using DevExpress.AspNetCore;
2+
using DevExpress.DashboardAspNetCore;
3+
using DevExpress.DashboardWeb;
4+
using Microsoft.Extensions.FileProviders;
5+
using AspNetCoreDashboard;
6+
7+
var builder = WebApplication.CreateBuilder(args);
8+
9+
IFileProvider? fileProvider = builder.Environment.ContentRootFileProvider;
10+
IConfiguration? configuration = builder.Configuration;
11+
12+
// Add services to the container.
13+
builder.Services.AddControllersWithViews();
14+
builder.Services.AddRazorPages();
15+
16+
builder.Services.AddDevExpressControls();
17+
builder.Services.AddScoped<DashboardConfigurator>((IServiceProvider serviceProvider) => {
18+
return DashboardUtils.CreateDashboardConfigurator(configuration, fileProvider);
19+
});
20+
21+
var app = builder.Build();
22+
23+
24+
// Configure the HTTP request pipeline.
25+
if (!app.Environment.IsDevelopment())
26+
{
27+
app.UseExceptionHandler("/Home/Error");
28+
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
29+
app.UseHsts();
30+
}
31+
32+
app.UseHttpsRedirection();
33+
app.UseStaticFiles();
34+
35+
app.UseDevExpressControls();
36+
37+
app.UseRouting();
38+
39+
app.UseAuthorization();
40+
app.MapRazorPages();
41+
app.MapDashboardRoute("dashboardControl", "DefaultDashboard");
42+
app.MapDefaultControllerRoute();
43+
44+
app.Run();
45+

‎CS/AspNetCoreDashboard/Storages/CustomDashboardFileStorage.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
using DevExpress.DashboardWeb;
2-
3-
namespace AspNetCoreDashboard.Storages {
4-
public class CustomDashboardFileStorage : DashboardFileStorage {
5-
public CustomDashboardFileStorage(string workingDirectory)
6-
: base(workingDirectory) {
7-
}
8-
9-
public void DeleteDashboard(string dashboardID) {
10-
var dashboardPath = base.ResolveFileName(dashboardID);
11-
if (File.Exists(dashboardPath))
12-
File.Delete(dashboardPath);
13-
}
14-
}
15-
}
16-
1+
using DevExpress.DashboardWeb;
2+
3+
namespace AspNetCoreDashboard.Storages {
4+
public class CustomDashboardFileStorage : DashboardFileStorage {
5+
public CustomDashboardFileStorage(string workingDirectory)
6+
: base(workingDirectory) {
7+
}
8+
9+
public void DeleteDashboard(string dashboardID) {
10+
var dashboardPath = base.ResolveFileName(dashboardID);
11+
if (File.Exists(dashboardPath))
12+
File.Delete(dashboardPath);
13+
}
14+
}
15+
}
16+

‎CS/AspNetCoreDashboard/bundleconfig.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{
33
"outputFileName": "wwwroot/css/site.min.css",
44
"inputFiles": [
5-
"node_modules/devextreme/dist/css/dx.common.css",
6-
"node_modules/devextreme/dist/css/dx.light.css",
5+
"node_modules/devextreme-dist/css/dx.common.css",
6+
"node_modules/devextreme-dist/css/dx.light.css",
77
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.common.css",
88
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.light.css",
99
"node_modules/@devexpress/analytics-core/dist/css/dx-querybuilder.css",
@@ -15,13 +15,12 @@
1515
"outputFileName": "wwwroot/js/site.min.js",
1616
"inputFiles": [
1717
"node_modules/jquery/dist/jquery.js",
18-
"node_modules/jquery-ui-dist/jquery-ui.js",
1918
"node_modules/knockout/build/output/knockout-latest.js",
2019
"node_modules/ace-builds/src-min-noconflict/ace.js",
2120
"node_modules/ace-builds/src-min-noconflict/ext-language_tools.js",
2221
"node_modules/ace-builds/src-min-noconflict/theme-dreamweaver.js",
2322
"node_modules/ace-builds/src-min-noconflict/theme-ambiance.js",
24-
"node_modules/devextreme/dist/js/dx.all.js",
23+
"node_modules/devextreme-dist/js/dx.all.js",
2524
"node_modules/@devexpress/analytics-core/dist/js/dx-analytics-core.min.js",
2625
"node_modules/@devexpress/analytics-core/dist/js/dx-querybuilder.min.js",
2726
"node_modules/devexpress-dashboard/dist/js/dx-dashboard.min.js"

‎CS/AspNetCoreDashboard/libman.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"defaultProvider": "filesystem",
44
"libraries": [
55
{
6-
"library": "node_modules/devextreme/dist/css/icons/",
6+
"library": "node_modules/devextreme-dist/css/icons/",
77
"destination": "wwwroot/css/icons/",
88
"files": [
99
"dxicons.ttf",

‎CS/AspNetCoreDashboard/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
{
2-
"name": "aspnetcoredashboard",
3-
"version": "1.0.0",
4-
"private": true,
5-
"dependencies": {
6-
"devextreme": "22.2-stable",
7-
"@devexpress/analytics-core": "22.2-stable",
8-
"devexpress-dashboard": "22.2-stable",
9-
"jquery-ui-dist": "^1.12.1"
10-
}
1+
{
2+
"name": "aspnetcoredashboard",
3+
"version": "1.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"devextreme-dist": "23.1-stable",
7+
"@devexpress/analytics-core": "23.1-stable",
8+
"devexpress-dashboard": "23.1-next"
9+
}
1110
}

‎config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
2-
"runOnWeb": false,
3-
"autoGenerateVb": false
4-
}
1+
{
2+
"runOnWeb": false,
3+
"autoGenerateVb": false
4+
}

‎readme.png

-4.48 KB
Loading

0 commit comments

Comments
 (0)