Skip to content

Commit

Permalink
Merge pull request #132 from alphacloud/feature/V4DependenciesUpgrade01
Browse files Browse the repository at this point in the history
Dependencies upgrade
  • Loading branch information
seif committed Jan 7, 2016
2 parents d696c36 + 2294269 commit 8ebfa6d
Show file tree
Hide file tree
Showing 111 changed files with 1,655 additions and 1,191 deletions.
19 changes: 11 additions & 8 deletions Build/Build.proj
Expand Up @@ -14,8 +14,10 @@
<MSpecSpecificationAssemblies>"$(MSBuildProjectDirectory)\..\Solutions\SharpArch.Specifications\Bin\Release\SharpArch.Specifications.dll"</MSpecSpecificationAssemblies>
</PropertyGroup>

<!-- build settings -->
<PropertyGroup>
<NugetLibFrameworkVersion>net45</NugetLibFrameworkVersion>
<UseNUnit3>true</UseNUnit3>
</PropertyGroup>

<ItemGroup>
Expand All @@ -24,14 +26,15 @@

<ItemGroup>
<PackageFiles Include="$(SolutionsPath)\**\*.*"
Exclude="$(SolutionsPath)\**\bin\**;
$(SolutionsPath)\.nuget\**;
$(SolutionsPath)\**\Logs\**;
$(SolutionsPath)\**\obj\**;
$(SolutionsPath)\**\*.suo;
$(SolutionsPath)\**\*.cache;
$(SolutionsPath)\**\_ReSharper*\**;
$(SolutionsPath)\**\*ReSharper*">
Exclude="$(SolutionsPath)\**\bin\**;
$(SolutionsPath)\.nuget\**;
$(SolutionsPath)\**\Logs\**;
$(SolutionsPath)\**\obj\**;
$(SolutionsPath)\**\*.suo;
$(SolutionsPath)\**\*.cache;
$(SolutionsPath)\**\.vs\**;
$(SolutionsPath)\**\_ReSharper*\**;
$(SolutionsPath)\**\*ReSharper*">
<PackageName>$(DropsPath)\$(SemanticVersion)\$(PackageName).Source.v$(SemanticVersion).zip</PackageName>
<WorkingDirectory>$(SolutionsPath)</WorkingDirectory>
<Flatten>False</Flatten>
Expand Down
2 changes: 1 addition & 1 deletion NugetTemplates/SharpArch.Domain/SharpArch.Domain.nuspec
Expand Up @@ -14,7 +14,7 @@
<language>en-US</language>
<dependencies>
<dependency id="CommonServiceLocator" version="1.3" />
<dependency id="Newtonsoft.Json" version="[6.0,7.0)" />
<dependency id="Newtonsoft.Json" version="[8.0.1,9.0)" />
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion NugetTemplates/SharpArch.RavenDb/SharpArch.RavenDB.nuspec
Expand Up @@ -13,7 +13,7 @@
<summary>Architectural foundation for building maintainable applications with Domain Driven Design patterns and practices</summary>
<language>en-US</language>
<dependencies>
<dependency id="RavenDB.Client" version="[3.0.3599,4.0.0)" />
<dependency id="RavenDB.Client" version="[3.0.30000,4.0.0)" />
<dependency id="SharpArch.Domain" version="[4.0.0,5.0.0)" />
</dependencies>
</metadata>
Expand Down
Expand Up @@ -16,7 +16,7 @@
<dependency id="Castle.Core" version="[3.3,4.0)" />
<dependency id="Castle.Windsor" version="[3.3,4.0)" />
<dependency id="Iesi.Collections" version="[4.0.1.4000,5.0.0.0)" />
<dependency id="Newtonsoft.Json" version="[6.0,7.0)" />
<dependency id="Newtonsoft.Json" version="[8.0.1,9.0)" />
<dependency id="SharpArch.Domain" version="[4.0.0,5.0.0)" />
<dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion NugetTemplates/SharpArch.Web.Mvc/SharpArch.Web.Mvc.nuspec
Expand Up @@ -13,7 +13,7 @@
<summary>Architectural foundation for building maintainable applications with Domain Driven Design patterns and practices</summary>
<language>en-US</language>
<dependencies>
<dependency id="Newtonsoft.Json" version="[6.0,7.0)" />
<dependency id="Newtonsoft.Json" version="[8.0.1,9.0)" />
<dependency id="SharpArch.Domain" version="[4.0.0,5.0.0)" />
<dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
</dependencies>
Expand Down
9 changes: 8 additions & 1 deletion Samples/TardisBank/Build/Build.proj
@@ -1,12 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PackageArtefacts" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<VersionMajor>4</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionPatch>0</VersionPatch>
<VersionPreRelease>Beta</VersionPreRelease>
</PropertyGroup>

<PropertyGroup>
<SolutionName>Suteki.TardisBank</SolutionName>
<SolutionsPath>$(MSBuildProjectDirectory)\..\Solutions</SolutionsPath>
<BuildPath>$(MSBuildProjectDirectory)\..\..\..\BuildSystem</BuildPath>
<WebAppPath>$(SolutionsPath)\$(SolutionName).Web.Mvc</WebAppPath>
<!-- SolutionRoot>$(BuildPath)\..\Samples\TardisBank</SolutionRoot -->
<UseNUnit3>true</UseNUnit3>
</PropertyGroup>

<ItemGroup>
Expand Down
60 changes: 30 additions & 30 deletions Samples/TardisBank/Database/UnitTestGeneratedSchema.sql
@@ -1,30 +1,30 @@

if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK76553502C8A05760]') AND parent_object_id = OBJECT_ID('Messages'))
alter table Messages drop constraint FK76553502C8A05760
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Messages_For_Users]') AND parent_object_id = OBJECT_ID('Messages'))
alter table Messages drop constraint FK_Messages_For_Users


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK90F02A4EDF10CD7C]') AND parent_object_id = OBJECT_ID('PaymentSchedules'))
alter table PaymentSchedules drop constraint FK90F02A4EDF10CD7C
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_PaymentSchedules_For_Accounts]') AND parent_object_id = OBJECT_ID('PaymentSchedules'))
alter table PaymentSchedules drop constraint FK_PaymentSchedules_For_Accounts


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK2045D237DF10CD7C]') AND parent_object_id = OBJECT_ID('Transactions'))
alter table Transactions drop constraint FK2045D237DF10CD7C
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Transactions_For_Accounts]') AND parent_object_id = OBJECT_ID('Transactions'))
alter table Transactions drop constraint FK_Transactions_For_Accounts


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK436E2330C8A05760]') AND parent_object_id = OBJECT_ID('Child'))
alter table Child drop constraint FK436E2330C8A05760
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Children_Join_Users]') AND parent_object_id = OBJECT_ID('Children'))
alter table Children drop constraint FK_Children_Join_Users


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK436E2330DF10CD7C]') AND parent_object_id = OBJECT_ID('Child'))
alter table Child drop constraint FK436E2330DF10CD7C
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Children_Ref_Accounts]') AND parent_object_id = OBJECT_ID('Children'))
alter table Children drop constraint FK_Children_Ref_Accounts


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK436E23304ED31B26]') AND parent_object_id = OBJECT_ID('Child'))
alter table Child drop constraint FK436E23304ED31B26
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Childrens_For_Parents]') AND parent_object_id = OBJECT_ID('Children'))
alter table Children drop constraint FK_Childrens_For_Parents


if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK8359A792C8A05760]') AND parent_object_id = OBJECT_ID('Parent'))
alter table Parent drop constraint FK8359A792C8A05760
if exists (select 1 from sys.objects where object_id = OBJECT_ID(N'[FK_Parents_Join_Users]') AND parent_object_id = OBJECT_ID('Parents'))
alter table Parents drop constraint FK_Parents_Join_Users


if exists (select * from dbo.sysobjects where id = object_id(N'Accounts') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Accounts
Expand All @@ -39,9 +39,9 @@ alter table Parent drop constraint FK8359A792C8A05760

if exists (select * from dbo.sysobjects where id = object_id(N'Users') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Users

if exists (select * from dbo.sysobjects where id = object_id(N'Child') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Child
if exists (select * from dbo.sysobjects where id = object_id(N'Children') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Children

if exists (select * from dbo.sysobjects where id = object_id(N'Parent') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Parent
if exists (select * from dbo.sysobjects where id = object_id(N'Parents') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table Parents

if exists (select * from dbo.sysobjects where id = object_id(N'hibernate_unique_key') and OBJECTPROPERTY(id, N'IsUserTable') = 1) drop table hibernate_unique_key

Expand Down Expand Up @@ -97,51 +97,51 @@ alter table Parent drop constraint FK8359A792C8A05760
primary key (UserId)
)

create table Child (
create table Children (
UserId INT not null,
ParentId INT null,
AccountId INT null,
primary key (UserId)
)

create table Parent (
create table Parents (
UserId INT not null,
ActivationKey NVARCHAR(255) null,
primary key (UserId)
)

alter table Messages
add constraint FK76553502C8A05760
add constraint FK_Messages_For_Users
foreign key (UserId)
references Users

alter table PaymentSchedules
add constraint FK90F02A4EDF10CD7C
add constraint FK_PaymentSchedules_For_Accounts
foreign key (AccountId)
references Accounts

alter table Transactions
add constraint FK2045D237DF10CD7C
add constraint FK_Transactions_For_Accounts
foreign key (AccountId)
references Accounts

alter table Child
add constraint FK436E2330C8A05760
alter table Children
add constraint FK_Children_Join_Users
foreign key (UserId)
references Users

alter table Child
add constraint FK436E2330DF10CD7C
alter table Children
add constraint FK_Children_Ref_Accounts
foreign key (AccountId)
references Accounts

alter table Child
add constraint FK436E23304ED31B26
alter table Children
add constraint FK_Childrens_For_Parents
foreign key (ParentId)
references Parent
references Parents

alter table Parent
add constraint FK8359A792C8A05760
alter table Parents
add constraint FK_Parents_Join_Users
foreign key (UserId)
references Users

Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 8ebfa6d

Please sign in to comment.