From 43c15802c183274d4cc3bd06812a05a285b1a229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Thu, 20 Sep 2018 12:27:49 +0200 Subject: [PATCH] Fixed bug #729 Removed bower in web MVC app --- src/Web/WebMVC/.bowerrc | 3 --- src/Web/WebMVC/Dockerfile | 8 -------- src/Web/WebMVC/WebMVC.csproj | 1 + src/Web/WebMVC/bower.json | 10 ---------- src/Web/WebMVC/libman.json | 19 +++++++++++++++++++ 5 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 src/Web/WebMVC/.bowerrc delete mode 100644 src/Web/WebMVC/bower.json create mode 100644 src/Web/WebMVC/libman.json diff --git a/src/Web/WebMVC/.bowerrc b/src/Web/WebMVC/.bowerrc deleted file mode 100644 index 6406626ab..000000000 --- a/src/Web/WebMVC/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "wwwroot/lib" -} diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 9847ad772..11315ae0c 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -6,15 +6,7 @@ EXPOSE 80 FROM microsoft/dotnet:2.1-sdk as dotnet-build WORKDIR /src -FROM ${NODE_IMAGE} as node-build -WORKDIR /web -COPY src/Web/WebMVC . -RUN npm install -g bower@1.8.4 -RUN bower install --allow-root - FROM dotnet-build as build -WORKDIR /src/src/Web/WebMVC/wwwroot -COPY --from=node-build /web/wwwroot . WORKDIR /src COPY . . WORKDIR /src/src/Web/WebMVC diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 1426517d3..5bd9b5f81 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -28,6 +28,7 @@ + diff --git a/src/Web/WebMVC/bower.json b/src/Web/WebMVC/bower.json deleted file mode 100644 index f6d44b1c0..000000000 --- a/src/Web/WebMVC/bower.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "asp.net", - "private": true, - "dependencies": { - "bootstrap": "v3.3.7", - "jquery": "2.2.0", - "jquery-validation": "1.14.0", - "jquery-validation-unobtrusive": "3.2.6" - } -} diff --git a/src/Web/WebMVC/libman.json b/src/Web/WebMVC/libman.json new file mode 100644 index 000000000..127c2bcaf --- /dev/null +++ b/src/Web/WebMVC/libman.json @@ -0,0 +1,19 @@ +{ + "version": "1.0", + "defaultProvider": "cdnjs", + "libraries": [ + { + "library": "jquery@3.3.1", + "destination": "wwwroot/lib/jquery/" + }, + { + "provider": "unpkg", + "library": "bootstrap@3.3.7", + "destination": "wwwroot/lib/bootstrap/" + }, + { + "library": "jquery-validation-unobtrusive@3.2.10", + "destination": "wwwroot/lib/jquery-validation-unobtrusive/" + } + ] +} \ No newline at end of file