Merge branch 'dev' of https://github.com/Orckestra/C1-CMS-Foundation …

…into dev
Orckestra · Nov 25, 2019 · 3685e2c · 3685e2c
2 parents 263e1b2 + 9c97150
commit 3685e2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Package.nuspec b/Package.nuspec
@@ -28,9 +28,8 @@
     <file src="Bin\Microsoft.Practices.EnterpriseLibrary.Logging.dll" target="lib\net471\" />
     <file src="Bin\Microsoft.Practices.EnterpriseLibrary.Validation.dll" target="lib\net471\" />
     <file src="Bin\Microsoft.Practices.ObjectBuilder.dll" target="lib\net471\" />
-
-	<!-- Not referencing Microsoft.Extensions.DependencyInjection via dependencies as they pull 50+ NuGet packages from .NET Core -->
-	<file src="packages\Microsoft.Extensions.DependencyInjection.1.1.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll" target="lib\net471\" />
-	<file src="packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll" target="lib\net471\" />	
+    <!-- Not referencing Microsoft.Extensions.DependencyInjection via dependencies as they pull 50+ NuGet packages from .NET Core -->
+    <file src="Bin\Microsoft.Extensions.DependencyInjection.dll" target="lib\net471\" />
+    <file src="Bin\Microsoft.Extensions.DependencyInjection.Abstractions.dll" target="lib\net471\" />	
   </files>
 </package>
diff --git a/Website/package.json b/Website/package.json
@@ -14,10 +14,10 @@
   "devDependencies": {
     "JSONPath": "^0.10.0",
     "autoprefixer-core": "^5.2.1",
-    "chromedriver": "^2.34.0",
     "chokidar-socket-emitter": "0.5.4",
+    "chromedriver": "^2.34.0",
     "csswring": "^3.0.5",
-    "eslint": "3.1.1",
+    "eslint": "^4.18.2",
     "eslint-plugin-mocha": "4.0.0",
     "eslint-plugin-react": "5.2.2",
     "grunt": "~0.4.5",