diff --git a/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj b/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj index 8706bcd..c23a9c3 100644 --- a/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj +++ b/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj @@ -88,7 +88,7 @@ - + diff --git a/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj b/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj index 7419be0..043259b 100644 --- a/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj +++ b/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj @@ -57,8 +57,8 @@ True - False - ..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll + ..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll + True @@ -94,6 +94,10 @@ + + ..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll + True + diff --git a/BetterModules.Core.Web.Tests/packages.config b/BetterModules.Core.Web.Tests/packages.config index 82353e3..79dcb61 100644 --- a/BetterModules.Core.Web.Tests/packages.config +++ b/BetterModules.Core.Web.Tests/packages.config @@ -9,4 +9,6 @@ + + \ No newline at end of file diff --git a/BetterModules.Core.Web/BetterModules.Core.Web.csproj b/BetterModules.Core.Web/BetterModules.Core.Web.csproj index a1f11cf..c3decb2 100644 --- a/BetterModules.Core.Web/BetterModules.Core.Web.csproj +++ b/BetterModules.Core.Web/BetterModules.Core.Web.csproj @@ -47,10 +47,6 @@ ..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll True - - ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - True - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -58,13 +54,10 @@ ..\packages\Mvc3Futures.3.0.20105.0\lib\Microsoft.Web.Mvc.dll - - ..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll + + ..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll True - - ..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll - @@ -94,6 +87,10 @@ False ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + + ..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll + True + diff --git a/BetterModules.Core.Web/packages.config b/BetterModules.Core.Web/packages.config index a6740ff..755c5dd 100644 --- a/BetterModules.Core.Web/packages.config +++ b/BetterModules.Core.Web/packages.config @@ -3,11 +3,11 @@ - - + + \ No newline at end of file diff --git a/BetterModules.Mvc5.Sandbox/Controllers/HomeController.cs b/BetterModules.Mvc5.Sandbox/Controllers/HomeController.cs index 3c4f835..10a7f99 100644 --- a/BetterModules.Mvc5.Sandbox/Controllers/HomeController.cs +++ b/BetterModules.Mvc5.Sandbox/Controllers/HomeController.cs @@ -15,31 +15,6 @@ public class HomeController : Controller { public ActionResult Index() { - using (var scope = ContextScopeProvider.CreateChildContainer()) - { - string postfix = "__1"; - - TestItemCategory category = new TestItemCategory(); - category.Name = "test_pm" + postfix; - - TestItemModel item = new TestItemModel(); - item.Name = "big test" + postfix; - item.Category = category; - - IRepository repository = scope.Resolve(); - IUnitOfWork unitOfWork = scope.Resolve(); - - repository.Save(item); - unitOfWork.Commit(); - - item.Name = "ups"; - item.Version = 3; - repository.Save(item); - unitOfWork.Commit(); - - var l = repository.AsQueryable().ToList(); - } - return View(); } } diff --git a/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj b/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj index 740c5a3..0d1e594 100644 --- a/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj +++ b/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj @@ -53,7 +53,6 @@ Designer - diff --git a/BetterModules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template b/BetterModules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template index 3e9b6f9..c5f44a4 100644 --- a/BetterModules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template +++ b/BetterModules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template @@ -12,8 +12,9 @@ BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE). - + + diff --git a/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template b/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template index 469e6e3..bbea9ac 100644 --- a/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template +++ b/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template @@ -11,13 +11,15 @@ The Core module for BetterModules. BetterModules is modular architecture supporting web based and business logic modules. BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE). - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1 b/BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1 deleted file mode 100644 index 3d7fd3b..0000000 --- a/BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -# Add reference. -$project.Object.References | Where-Object { $_.Name -eq 'FluentMigrator.Runner' } | ForEach-Object { $_.Remove() } -$project.Object.References.Add("$installPath\..\FluentMigrator.Tools.1.0.6.0\tools\AnyCPU\40\FluentMigrator.Runner.dll") \ No newline at end of file diff --git a/Libs/RazorGenerator.Mvc.2.2.3/RazorGenerator.Mvc.dll b/Libs/RazorGenerator.Mvc.2.2.3/RazorGenerator.Mvc.dll deleted file mode 100644 index fc2df5b..0000000 Binary files a/Libs/RazorGenerator.Mvc.2.2.3/RazorGenerator.Mvc.dll and /dev/null differ