Skip to content

Commit 2be7421

Browse files
committed
In sample projects optimized a building of client-side assets
1 parent 15cd800 commit 2be7421

File tree

252 files changed

+259
-13864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+259
-13864
lines changed

JavaScriptEngineSwitcher.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<Project Path="samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj" />
7171
<Project Path="samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />
7272
<Project Path="samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj" Id="8124df18-4a0b-4648-8b90-4a6d3e4ef2f3" />
73+
<Project Path="samples/JavaScriptEngineSwitcher.Sample.AspNetCore.ClientSideAssets/JavaScriptEngineSwitcher.Sample.AspNetCore.ClientSideAssets.csproj" />
7374
<Project Path="samples/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.csproj" />
7475
<Project Path="samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj" />
7576
<Project Path="samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj" />

samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,10 @@
182182
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
183183
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
184184
</Target>
185-
<Target Name="NodePackageInstallation" BeforeTargets="BeforeBuild;BeforeClean">
186-
<Exec Command="npm install" ConsoleToMsBuild="true" />
187-
</Target>
188-
<Target Name="BowerPackagesInstallation" AfterTargets="AfterBuild">
189-
<Exec Command="bower install" ConsoleToMsBuild="true" />
190-
</Target>
191-
<Target Name="GulpClean" AfterTargets="AfterClean">
192-
<Exec Command="gulp cleanBuildedAssets" ConsoleToMsBuild="true" />
193-
</Target>
194-
<Target Name="GulpBuild" AfterTargets="BowerPackagesInstallation">
195-
<Exec Command="gulp buildAssets" ConsoleToMsBuild="true" />
185+
<Target Name="EnsureClientSideAssetsBuilded" BeforeTargets="BeforeBuild">
186+
<Error
187+
Condition=" !Exists('./styles/build/common-styles.min.css') Or !Exists('./lib/jquery/jquery.min.js') Or !Exists('./scripts/build/common-scripts.min.js') "
188+
Text="You need to build client-side assets for ASP.NET MVC 4 sample. To do this, run a `build-frontend.cmd` or `build-frontend.sh` script in the `$(ProjectDir)` directory." />
196189
</Target>
197190
<ProjectExtensions>
198191
<VisualStudio>
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
@echo off
2+
setlocal
3+
4+
::--------------------------------------------------------------------------------
5+
:: Build
6+
::--------------------------------------------------------------------------------
7+
8+
echo Starting to build the frontend for ASP.NET MVC 4 sample ...
9+
echo.
10+
11+
echo Installing Node.js packages ...
12+
echo.
13+
call npm install
14+
if errorlevel 1 goto error
15+
echo.
16+
17+
echo Installing Bower packages ...
18+
echo.
19+
call bower install
20+
if errorlevel 1 goto error
21+
echo.
22+
23+
echo Building client-side assets ...
24+
echo.
25+
call gulp
26+
if errorlevel 1 goto error
27+
echo.
28+
29+
::--------------------------------------------------------------------------------
30+
:: Exit
31+
::--------------------------------------------------------------------------------
32+
33+
echo Succeeded!
34+
goto exit
35+
36+
:error
37+
echo *** Error: The previous step failed!
38+
39+
:exit
40+
cd ../../
41+
endlocal
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env bash
2+
3+
function handle_error()
4+
{
5+
_RET=${PIPESTATUS[0]}
6+
if [[ $_RET != 0 ]]; then
7+
echo "*** Error: The previous step failed!"
8+
9+
cd ../../
10+
exit $_RET
11+
fi
12+
}
13+
14+
echo "Starting to build the frontend for ASP.NET MVC 4 sample ..."
15+
echo ""
16+
17+
echo "Installing Node.js packages ..."
18+
echo ""
19+
npm install
20+
handle_error
21+
echo ""
22+
23+
echo "Installing Bower packages ..."
24+
echo ""
25+
bower install
26+
handle_error
27+
echo ""
28+
29+
echo "Building client-side assets ..."
30+
echo ""
31+
gulp
32+
handle_error
33+
echo ""
34+
35+
echo "Succeeded!"
36+
37+
cd ../../
38+
exit $_RET

samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/.bowerrc renamed to samples/JavaScriptEngineSwitcher.Sample.AspNetCore.ClientSideAssets/.bowerrc

File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Product>JS Engine Switcher: Client-Side Assets for ASP.NET Core Samples</Product>
5+
<VersionPrefix>3.30.2</VersionPrefix>
6+
<TargetFramework>netstandard2.0</TargetFramework>
7+
<OutputType>Library</OutputType>
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
10+
11+
</Project>

samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/bower.json renamed to samples/JavaScriptEngineSwitcher.Sample.AspNetCore.ClientSideAssets/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "jsengineswitcher.sample.aspnetcore1.mvc1",
2+
"name": "javascriptengineswitcher.sample.aspnetcore.clientsideassets",
33
"dependencies": {
44
"modernizr": "2.8.3",
55
"jquery-compat": "jquery#1.10.2",
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
@echo off
2+
setlocal
3+
4+
::--------------------------------------------------------------------------------
5+
:: Build
6+
::--------------------------------------------------------------------------------
7+
8+
echo Starting to build the frontend for ASP.NET Core samples ...
9+
echo.
10+
11+
echo Installing Node.js packages ...
12+
echo.
13+
call npm install
14+
if errorlevel 1 goto error
15+
echo.
16+
17+
echo Installing Bower packages ...
18+
echo.
19+
call bower install
20+
if errorlevel 1 goto error
21+
echo.
22+
23+
echo Building client-side assets ...
24+
echo.
25+
call gulp
26+
if errorlevel 1 goto error
27+
echo.
28+
29+
::--------------------------------------------------------------------------------
30+
:: Exit
31+
::--------------------------------------------------------------------------------
32+
33+
echo Succeeded!
34+
goto exit
35+
36+
:error
37+
echo *** Error: The previous step failed!
38+
39+
:exit
40+
cd ../../
41+
endlocal
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env bash
2+
3+
function handle_error()
4+
{
5+
_RET=${PIPESTATUS[0]}
6+
if [[ $_RET != 0 ]]; then
7+
echo "*** Error: The previous step failed!"
8+
9+
cd ../../
10+
exit $_RET
11+
fi
12+
}
13+
14+
echo "Starting to build the frontend for ASP.NET Core samples ..."
15+
echo ""
16+
17+
echo "Installing Node.js packages ..."
18+
echo ""
19+
npm install
20+
handle_error
21+
echo ""
22+
23+
echo "Installing Bower packages ..."
24+
echo ""
25+
bower install
26+
handle_error
27+
echo ""
28+
29+
echo "Building client-side assets ..."
30+
echo ""
31+
gulp
32+
handle_error
33+
echo ""
34+
35+
echo "Succeeded!"
36+
37+
cd ../../
38+
exit $_RET
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="EnsureClientSideAssetsBuilded" BeforeTargets="BeforeBuild">
4+
<Error
5+
Condition=" !Exists('$(MSBuildThisFileDirectory)wwwroot/styles/build/common-styles.min.css') Or !Exists('$(MSBuildThisFileDirectory)wwwroot/lib/jquery/jquery.min.js') Or !Exists('$(MSBuildThisFileDirectory)wwwroot/scripts/build/common-scripts.min.js') "
6+
Text="You need to build client-side assets for ASP.NET Core samples. To do this, run a `build-frontend.cmd` or `build-frontend.sh` script in the `$(MSBuildThisFileDirectory)` directory." />
7+
</Target>
8+
</Project>

0 commit comments

Comments
 (0)