Skip to content

Commit d529c13

Browse files
pauliusmaciulispauliusmaciulis
committed
nuspec updated. RazorGenerator.Mvc.dll lib removed and added as nuget package.
1 parent 56cb5f5 commit d529c13

File tree

11 files changed

+28
-53
lines changed

11 files changed

+28
-53
lines changed

‎BetterModules.Core.Database.Tests/BetterModules.Core.Database.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<Compile Include="DataAccess\DataContext\EventListeners\DeleteEventListenerIntegrationTests.cs" />
8989
<Compile Include="DataAccess\DataContext\EventListeners\SaveOrUpdateEventListenerTests.cs" />
9090
<Compile Include="DataAccess\DataContext\Fetching\DefaultFetchingProviderIntegrationTests.cs" />
91-
<Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorIntegrationTests - Copy.cs" />
91+
<Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorOnDeleteIntegrationTests .cs" />
9292
<Compile Include="DataAccess\DataContext\Interceptors\StaleInterceptorIntegrationTests.cs" />
9393
<Compile Include="DataAccess\DataContext\Migrations\DefaultMigrationTests.cs" />
9494
<Compile Include="DataAccess\DataContext\Migrations\DefaultVersionCheckerIntegrationTests.cs" />

‎BetterModules.Core.Web.Tests/BetterModules.Core.Web.Tests.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll</HintPath>
60+
<HintPath>..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll</HintPath>
61+
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="System" />
6464
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -94,6 +94,10 @@
9494
<Reference Include="Microsoft.CSharp" />
9595
<Reference Include="System.Data" />
9696
<Reference Include="System.Xml" />
97+
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
98+
<HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
99+
<Private>True</Private>
100+
</Reference>
97101
</ItemGroup>
98102
<ItemGroup>
99103
<Compile Include="Configuration\DefaultWebConfigurationLoaderTests.cs" />

‎BetterModules.Core.Web.Tests/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
1010
<package id="NHibernate" version="4.0.4.4000" targetFramework="net45" />
1111
<package id="NUnit" version="2.6.4" targetFramework="net45" />
12+
<package id="RazorGenerator.Mvc" version="2.3.12" targetFramework="net45" />
13+
<package id="WebActivatorEx" version="2.0.3" targetFramework="net45" />
1214
</packages>

‎BetterModules.Core.Web/BetterModules.Core.Web.csproj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,17 @@
4747
<HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
5450
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5551
<Private>True</Private>
5652
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5753
</Reference>
5854
<Reference Include="Microsoft.Web.Mvc">
5955
<HintPath>..\packages\Mvc3Futures.3.0.20105.0\lib\Microsoft.Web.Mvc.dll</HintPath>
6056
</Reference>
61-
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
62-
<HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
57+
<Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
58+
<HintPath>..\packages\RazorGenerator.Mvc.2.3.12\lib\net40\RazorGenerator.Mvc.dll</HintPath>
6359
<Private>True</Private>
6460
</Reference>
65-
<Reference Include="RazorGenerator.Mvc">
66-
<HintPath>..\Libs\RazorGenerator.Mvc.2.2.3\RazorGenerator.Mvc.dll</HintPath>
67-
</Reference>
6861
<Reference Include="System" />
6962
<Reference Include="System.configuration" />
7063
<Reference Include="System.Core" />
@@ -94,6 +87,10 @@
9487
<SpecificVersion>False</SpecificVersion>
9588
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9689
</Reference>
90+
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
91+
<HintPath>..\packages\WebActivatorEx.2.0.3\lib\net40\WebActivatorEx.dll</HintPath>
92+
<Private>True</Private>
93+
</Reference>
9794
</ItemGroup>
9895
<ItemGroup>
9996
<Compile Include="..\SharedAssemblyInfo.cs">

‎BetterModules.Core.Web/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<package id="Autofac" version="3.5.2" targetFramework="net45" />
44
<package id="Common.Logging" version="3.3.1" targetFramework="net45" />
55
<package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
6-
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net45" />
76
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
87
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
98
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
109
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
1110
<package id="Mvc3Futures" version="3.0.20105.0" targetFramework="net40" />
12-
<package id="NHibernate" version="4.0.4.4000" targetFramework="net45" />
11+
<package id="RazorGenerator.Mvc" version="2.3.12" targetFramework="net45" />
12+
<package id="WebActivatorEx" version="2.0.3" targetFramework="net45" />
1313
</packages>

‎BetterModules.Mvc5.Sandbox/Controllers/HomeController.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,6 @@ public class HomeController : Controller
1515
{
1616
public ActionResult Index()
1717
{
18-
using (var scope = ContextScopeProvider.CreateChildContainer())
19-
{
20-
string postfix = "__1";
21-
22-
TestItemCategory category = new TestItemCategory();
23-
category.Name = "test_pm" + postfix;
24-
25-
TestItemModel item = new TestItemModel();
26-
item.Name = "big test" + postfix;
27-
item.Category = category;
28-
29-
IRepository repository = scope.Resolve<IRepository>();
30-
IUnitOfWork unitOfWork = scope.Resolve<IUnitOfWork>();
31-
32-
repository.Save(item);
33-
unitOfWork.Commit();
34-
35-
item.Name = "ups";
36-
item.Version = 3;
37-
repository.Save(item);
38-
unitOfWork.Commit();
39-
40-
var l = repository.AsQueryable<TestItemCategory>().ToList();
41-
}
42-
4318
return View();
4419
}
4520
}

‎BetterModules.NugetPackage/BetterModules.NugetPackage.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<None Include="Packages\BetterModules.Core\BetterModules.Core.nuspec.template">
5454
<SubType>Designer</SubType>
5555
</None>
56-
<None Include="Packages\BetterModules.Core\install.ps1" />
5756
</ItemGroup>
5857
<ItemGroup />
5958
<ItemGroup>

‎BetterModules.NugetPackage/Packages/BetterModules.Core.Web/BetterModules.Core.Web.nuspec.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<copyright>BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE).</copyright>
1313
<dependencies>
1414
<dependency id="BetterModules.Core" version="[@BetterModulesVersion@]" />
15-
<dependency id="Autofac" version="3.5.0" />
15+
<dependency id="Autofac" version="3.5.2" />
1616
<dependency id="Common.Logging" version="3.3.1" />
17+
<dependency id="Common.Logging.Core" version="3.3.1" />
1718
<dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
1819
<dependency id="Microsoft.AspNet.Razor" version="3.2.3" />
1920
<dependency id="Microsoft.AspNet.WebPages" version="3.2.3" />

‎BetterModules.NugetPackage/Packages/BetterModules.Core/BetterModules.Core.nuspec.template

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
<description>The Core module for BetterModules. BetterModules is modular architecture supporting web based and business logic modules.</description>
1212
<copyright>BetterModules is licensed under MIT LICENSE AGREEMENT (https://github.com/devbridge/BetterModules/blob/master/LICENSE).</copyright>
1313
<dependencies>
14-
<dependency id="Autofac" version="3.1.5" />
15-
<dependency id="Common.Logging" version="2.1.2" />
16-
<dependency id="FluentMigrator" version="[1.0.6.0]" />
17-
<dependency id="FluentMigrator.Tools" version="[1.0.6.0]" />
18-
<dependency id="FluentNHibernate" version="[1.3.0.733]" />
19-
<dependency id="Iesi.Collections" version="3.3.1.4000" />
20-
<dependency id="NHibernate" version="[3.3.3.4001]" />
14+
<dependency id="Autofac" version="3.5.2" />
15+
<dependency id="Common.Logging" version="3.3.1" />
16+
<dependency id="Common.Logging.Core" version="3.3.1" />
17+
<dependency id="FluentMigrator" version="[1.6.1.0]" />
18+
<dependency id="FluentMigrator.Tools" version="[1.6.1.0]" />
19+
<dependency id="FluentMigrator.Runner" version="[1.6.1.0]" />
20+
<dependency id="FluentNHibernate" version="[2.0.3.0]" />
21+
<dependency id="Iesi.Collections" version="4.0.0.4000" />
22+
<dependency id="NHibernate" version="[4.0.4.4000]" />
2123
</dependencies>
2224
</metadata>
2325
</package>

‎BetterModules.NugetPackage/Packages/BetterModules.Core/install.ps1

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)