From dc538cfe40e628d47fd7021aac44a325be3ab22d Mon Sep 17 00:00:00 2001 From: Rafsanul Hasan Date: Thu, 4 Apr 2019 15:09:24 +0600 Subject: [PATCH] fix nuget package conflicts --- .../Basket.FunctionalTests.csproj | 3 +++ .../Basket.UnitTests/Basket.UnitTests.csproj | 4 ++++ .../Catalog.FunctionalTests.csproj | 3 +++ .../Catalog.UnitTests/Catalog.UnitTests.csproj | 4 ++++ .../Locations.FunctionalTests.csproj | 3 +++ .../Marketing.FunctionalTests.csproj | 5 +++++ .../Ordering.FunctionalTests.csproj | 3 +++ .../Ordering.UnitTests.csproj | 3 +++ src/Web/WebMVC/libman.json | 18 +----------------- .../Application.FunctionalTests.csproj | 6 ++++++ 10 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj index e781b218d..eefed5a6f 100644 --- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj +++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj @@ -17,8 +17,11 @@ + + + all diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj index bf5cb593a..9debe475f 100644 --- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj +++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj @@ -7,7 +7,11 @@ + + + + all diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index 07e9e2991..3a2d91f0f 100644 --- a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -33,8 +33,11 @@ + + + all diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj index 6a9a2bf99..8d292a14b 100644 --- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj +++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj @@ -7,7 +7,11 @@ + + + + all diff --git a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj index 0b7e0a3c4..a158350e9 100644 --- a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj +++ b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj @@ -17,8 +17,11 @@ + + + all diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj index ae4f51ed7..dac1b792f 100644 --- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj +++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj @@ -17,8 +17,13 @@ + + + + + all diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 93f6bfb88..d82528a2d 100644 --- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -17,8 +17,11 @@ + + + all diff --git a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj index e94aae4f1..77cebe238 100644 --- a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj +++ b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj @@ -7,7 +7,10 @@ + + + all diff --git a/src/Web/WebMVC/libman.json b/src/Web/WebMVC/libman.json index 659badb39..c7afabd8c 100644 --- a/src/Web/WebMVC/libman.json +++ b/src/Web/WebMVC/libman.json @@ -9,14 +9,6 @@ { "provider": "unpkg", "library": "bootstrap@4.3.1", - "files": [ - "dist/css/bootstrap.css", - "dist/css/bootstrap.css.map", - "dist/css/bootstrap.min.css", - "dist/css/bootstrap.min.css.map", - "dist/js/bootstrap.js", - "dist/js/bootstrap.min.js" - ], "destination": "wwwroot/lib/bootstrap/" }, { @@ -25,11 +17,7 @@ }, { "library": "jquery-validate@1.19.0", - "destination": "wwwroot/lib/jquery-validate/", - "files": [ - "jquery.validate.min.js", - "jquery.validate.js" - ] + "destination": "wwwroot/lib/jquery-validate/" }, { "library": "toastr.js@2.1.4", @@ -38,10 +26,6 @@ { "provider": "unpkg", "library": "@aspnet/signalr@1.1.2", - "files": [ - "dist/browser/signalr.js", - "dist/browser/signalr.min.js" - ], "destination": "wwwroot/lib/@aspnet/signalr/" } ] diff --git a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj index 1d7ebd5a5..c359f8f1a 100644 --- a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj +++ b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj @@ -67,8 +67,14 @@ + + + + + + all