nuspec updated. RazorGenerator.Mvc.dll lib removed and added as nuget…

… package.
devbridge · Dec 13, 2015 · d529c13 · d529c13
1 parent 56cb5f5
commit d529c13
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 53 deletions.
diff --git a/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj b/BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj
@@ -88,7 +88,7 @@
     <Compile Include="DataAccess\DataContext\EventListeners\DeleteEventListenerIntegrationTests.cs" />
     <Compile Include="DataAccess\DataContext\EventListeners\SaveOrUpdateEventListenerTests.cs" />
     <Compile Include="DataAccess\DataContext\Fetching\DefaultFetchingProviderIntegrationTests.cs" />
-    <Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorIntegrationTests - Copy.cs" />
+    <Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorOnDeleteIntegrationTests .cs" />
     <Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorIntegrationTests.cs" />
     <Compile Include="DataAccess\DataContext\Migrations\DefaultMigrationTests.cs" />
     <Compile Include="DataAccess\DataContext\Migrations\DefaultVersionCheckerIntegrationTests.cs" />

diff --git a/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj b/BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj
@@ -57,8 +57,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll</HintPath>
+      <HintPath>..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -94,6 +94,10 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\DefaultWebConfigurationLoaderTests.cs" />

diff --git a/BetterModules.Core.Web.Tests/packages.config b/BetterModules.Core.Web.Tests/packages.config
@@ -9,4 +9,6 @@
   <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
   <package id="NHibernate" version="4.0.4.4000" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="RazorGenerator.Mvc" version="2.3.12" targetFramework="net45" />
+  <package id="WebActivatorEx" version="2.0.3" targetFramework="net45" />
 </packages>
diff --git a/BetterModules.Core.Web/BetterModules.Core.Web.csproj b/BetterModules.Core.Web/BetterModules.Core.Web.csproj
@@ -47,24 +47,17 @@
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Mvc">
       <HintPath>..\packages\Mvc3Futures.3.0.20105.0\lib\Microsoft.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    <Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RazorGenerator.Mvc">
-      <HintPath>..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -94,6 +87,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">

diff --git a/BetterModules.Core.Web/packages.config b/BetterModules.Core.Web/packages.config
@@ -3,11 +3,11 @@
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
-  <package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="Mvc3Futures" version="3.0.20105.0" targetFramework="net40" />
-  <package id="NHibernate" version="4.0.4.4000" targetFramework="net45" />
+  <package id="RazorGenerator.Mvc" version="2.3.12" targetFramework="net45" />
+  <package id="WebActivatorEx" version="2.0.3" targetFramework="net45" />
 </packages>
diff --git 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<IRepository>();
-                IUnitOfWork unitOfWork = scope.Resolve<IUnitOfWork>();
-
-                repository.Save(item);
-                unitOfWork.Commit();
-
-                item.Name = "ups";
-                item.Version = 3;
-                repository.Save(item);
-                unitOfWork.Commit();
-
-                var l = repository.AsQueryable<TestItemCategory>().ToList();
-            }
-
             return View();
         }
     }

diff --git a/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj b/BetterModules.NugetPackage/BetterModules.NugetPackage.csproj
@@ -53,7 +53,6 @@
     <None Include="Packages\BetterModules.Core\BetterModules.Core.nuspec.template">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Packages\BetterModules.Core\install.ps1" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

diff --git a/...dules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template b/...dules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template
@@ -12,8 +12,9 @@
     <copyright>BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE).</copyright>
     <dependencies>
       <dependency id="BetterModules.Core" version="[@BetterModulesVersion@]" />
-      <dependency id="Autofac" version="3.5.0" />
+      <dependency id="Autofac" version="3.5.2" />
       <dependency id="Common.Logging" version="3.3.1" />
+      <dependency id="Common.Logging.Core" version="3.3.1" />
       <dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
       <dependency id="Microsoft.AspNet.Razor" version="3.2.3" />
       <dependency id="Microsoft.AspNet.WebPages" version="3.2.3" />

diff --git a/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template b/BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template
@@ -11,13 +11,15 @@
     <description>The Core module for BetterModules. BetterModules is modular architecture supporting web based and business logic modules.</description>
     <copyright>BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE).</copyright>
     <dependencies>
-      <dependency id="Autofac" version="3.1.5" />
-      <dependency id="Common.Logging" version="2.1.2" />
-      <dependency id="FluentMigrator" version="[1.0.6.0]" />
-      <dependency id="FluentMigrator.Tools" version="[1.0.6.0]" />
-      <dependency id="FluentNHibernate" version="[1.3.0.733]" />
-      <dependency id="Iesi.Collections" version="3.3.1.4000" />
-      <dependency id="NHibernate" version="[3.3.3.4001]" />
+      <dependency id="Autofac" version="3.5.2" />
+      <dependency id="Common.Logging" version="3.3.1" />
+      <dependency id="Common.Logging.Core" version="3.3.1" />
+      <dependency id="FluentMigrator" version="[1.6.1.0]" />
+      <dependency id="FluentMigrator.Tools" version="[1.6.1.0]" />
+      <dependency id="FluentMigrator.Runner" version="[1.6.1.0]" />
+      <dependency id="FluentNHibernate" version="[2.0.3.0]" />
+      <dependency id="Iesi.Collections" version="4.0.0.4000" />
+      <dependency id="NHibernate" version="[4.0.4.4000]" />
     </dependencies>
   </metadata>
 </package>
diff --git a/BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1 b/BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1
diff --git a/Libs/RazorGenerator.Mvc.2.2.3/RazorGenerator.Mvc.dll b/Libs/RazorGenerator.Mvc.2.2.3/RazorGenerator.Mvc.dll