Skip to content

Commit 89d50d6

Browse files
ASP.NET Core - Remove gulp
1 parent 3ab8df7 commit 89d50d6

4 files changed

Lines changed: 40 additions & 126 deletions

File tree

ASP.NET Core/ASP.NET Core.csproj

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,47 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<NodeModulesDir>$(ProjectDir)node_modules\</NodeModulesDir>
6+
<WwwRootDir>$(ProjectDir)wwwroot\</WwwRootDir>
57
</PropertyGroup>
68

7-
<Target Name="DebugEnsureNodeEnv" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
9+
<Target Name="DebugEnsureNodeEnv" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(ProjectDir)node_modules') ">
810
<!-- Ensure Node.js is installed -->
911
<Exec Command="node --version" ContinueOnError="true">
1012
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
1113
</Exec>
1214
<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." />
1315
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
14-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
16+
<Exec WorkingDirectory="$(ProjectDir)" Command="npm install" />
1517
</Target>
16-
<Target Name="RunGulp" BeforeTargets="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And Exists('$(SpaRoot)node_modules') ">
17-
<Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp add-resources" ContinueOnError="false">
18-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
19-
</Exec>
18+
19+
<Target Name="CopyFilesFromNodeModules" BeforeTargets="Build">
20+
<ItemGroup>
21+
<JSFiles Include="$(NodeModulesDir)jquery\dist\jquery.min.js" />
22+
<JSFiles Include="$(NodeModulesDir)bootstrap\dist\js\bootstrap.min.js" />
23+
<JSFiles Include="$(NodeModulesDir)devextreme-dist\js\dx.all.js" />
24+
<JSFiles Include="$(NodeModulesDir)devextreme-dist\js\dx.aspnet.mvc.js" />
25+
<JSFiles Include="$(NodeModulesDir)devextreme-aspnet-data\js\dx.aspnet.data.js" />
26+
</ItemGroup>
27+
<Copy SourceFiles="@(JSFiles)" DestinationFolder="$(WwwRootDir)js\" SkipUnchangedFiles="true" />
28+
29+
<ItemGroup>
30+
<CSSFiles Include="$(NodeModulesDir)bootstrap\dist\css\bootstrap.css" />
31+
<CSSFiles Include="$(NodeModulesDir)devextreme-dist\css\dx.common.css" />
32+
<CSSFiles Include="$(NodeModulesDir)devextreme-dist\css\dx.material.blue.light.compact.css" />
33+
</ItemGroup>
34+
<Copy SourceFiles="@(CSSFiles)" DestinationFolder="$(WwwRootDir)css\" SkipUnchangedFiles="true" />
35+
36+
<ItemGroup>
37+
<IconFiles Include="$(NodeModulesDir)devextreme-dist\css\icons\**\*" />
38+
</ItemGroup>
39+
<Copy SourceFiles="@(IconFiles)" DestinationFolder="$(WwwRootDir)css\icons\%(RecursiveDir)" SkipUnchangedFiles="true" />
40+
41+
<ItemGroup>
42+
<FontFiles Include="$(NodeModulesDir)devextreme-dist\css\fonts\**\*" />
43+
</ItemGroup>
44+
<Copy SourceFiles="@(FontFiles)" DestinationFolder="$(WwwRootDir)css\fonts\%(RecursiveDir)" SkipUnchangedFiles="true" />
2045
</Target>
2146

2247
<ItemGroup>

ASP.NET Core/Views/Shared/_Layout.cshtml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@
1414
@* Uncomment to use the HtmlEditor control *@
1515
@* <script src="https://unpkg.com/devextreme-quill/dist/dx-quill.min.js"></script> *@
1616

17-
<link rel="stylesheet" href="~/css/vendor.css" asp-append-version="true" />
17+
<link rel="stylesheet" href="~/css/bootstrap.css" asp-append-version="true" />
18+
<link rel="stylesheet" href="~/css/dx.common.css" asp-append-version="true" />
19+
<link rel="stylesheet" href="~/css/dx.material.blue.light.compact.css" asp-append-version="true" />
1820
<link rel="stylesheet" href="~/css/Site.css" />
19-
<script src="~/js/vendor.js" asp-append-version="true"></script>
21+
<script src="~/js/jquery.min.js" asp-append-version="true"></script>
22+
<script src="~/js/bootstrap.min.js" asp-append-version="true"></script>
23+
<script src="~/js/dx.all.js" asp-append-version="true"></script>
24+
<script src="~/js/dx.aspnet.mvc.js" asp-append-version="true"></script>
25+
<script src="~/js/dx.aspnet.data.js" asp-append-version="true"></script>
2026
</head>
2127

2228
<body class="dx-viewport">

ASP.NET Core/gulpfile.js

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

ASP.NET Core/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@
77
"devextreme-dist": "^25.2.3",
88
"devextreme-aspnet-data": "^5.1.0",
99
"bootstrap": "^5.3.7"
10-
},
11-
"devDependencies": {
12-
"gulp": "4.0.2",
13-
"gulp-concat": "2.6.1",
14-
"rimraf": "5.0.7"
1510
}
1611
}

0 commit comments

Comments
 (0)