Skip to content

Commit 43e7dce

Browse files
committed
Upgraded to ABP to v0.7.3.0 and other nuget packages.
1 parent 82274f8 commit 43e7dce

File tree

53 files changed

+10537
-4912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+10537
-4912
lines changed

src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.1.0\lib\net451\Abp.AutoMapper.dll</HintPath>
39+
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.Application/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
55
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
77
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.Core/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
44
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
55
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
66
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.EntityFramework, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.EntityFramework.0.7.1.0\lib\net451\Abp.EntityFramework.dll</HintPath>
39+
<Reference Include="Abp.EntityFramework, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.EntityFramework.0.7.2.0\lib\net451\Abp.EntityFramework.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
4-
<package id="Abp.EntityFramework" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.EntityFramework" version="0.7.2.0" targetFramework="net451" />
55
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.FluentMigrator, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.FluentMigrator.0.7.1.0\lib\net451\Abp.FluentMigrator.dll</HintPath>
39+
<Reference Include="Abp.FluentMigrator, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.FluentMigrator.0.7.3.0\lib\net451\Abp.FluentMigrator.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.NHibernate, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.NHibernate.0.7.1.0\lib\net451\Abp.NHibernate.dll</HintPath>
43+
<Reference Include="Abp.NHibernate, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.NHibernate.0.7.2.0\lib\net451\Abp.NHibernate.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.NHibernate/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
4-
<package id="Abp.FluentMigrator" version="0.7.1.0" targetFramework="net451" />
5-
<package id="Abp.NHibernate" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.FluentMigrator" version="0.7.3.0" targetFramework="net451" />
5+
<package id="Abp.NHibernate" version="0.7.2.0" targetFramework="net451" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
77
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
88
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
35+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
39-
<Reference Include="Abp.AutoMapper, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Abp.AutoMapper.0.7.1.0\lib\net451\Abp.AutoMapper.dll</HintPath>
39+
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Abp.Web, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Abp.Web.0.7.1.0\lib\net451\Abp.Web.dll</HintPath>
43+
<Reference Include="Abp.Web, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Abp.Web.0.7.3.0\lib\net451\Abp.Web.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Abp.Web.Api, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Web.Api.0.7.1.0\lib\net451\Abp.Web.Api.dll</HintPath>
47+
<Reference Include="Abp.Web.Api, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Web.Api.0.7.2.0\lib\net451\Abp.Web.Api.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.WebApi/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.1.0" targetFramework="net451" />
5-
<package id="Abp.Web" version="0.7.1.0" targetFramework="net451" />
6-
<package id="Abp.Web.Api" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
5+
<package id="Abp.Web" version="0.7.3.0" targetFramework="net451" />
6+
<package id="Abp.Web.Api" version="0.7.2.0" targetFramework="net451" />
77
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
88
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
99
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,31 @@
102102
return true;
103103
};
104104

105+
/* FEATURE SYSTEM *********************************************/
106+
//Implements Features API that simplifies usage of feature scripts generated by Abp.
107+
108+
abp.features = abp.features || {};
109+
110+
abp.features.allFeatures = abp.features.allFeatures || {};
111+
112+
abp.features.get = function(name) {
113+
return abp.features.allFeatures[name];
114+
}
115+
116+
abp.features.getValue = function (name) {
117+
var feature = abp.features.get(name);
118+
if (feature == undefined) {
119+
return undefined;
120+
}
121+
122+
return feature.value;
123+
}
124+
125+
abp.features.isEnabled = function (name) {
126+
var value = abp.features.getValue(name);
127+
return value == 'true' || value == 'True';
128+
}
129+
105130
/* SETTINGS **************************************************/
106131
//Implements Settings API that simplifies usage of setting scripts generated by Abp.
107132

@@ -114,7 +139,8 @@
114139
};
115140

116141
abp.setting.getBoolean = function (name) {
117-
return abp.setting.values[name] == 'true';
142+
var value = abp.setting.get(name);
143+
return value == 'true' || value == 'True';
118144
};
119145

120146
abp.setting.getInt = function (name) {

src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@
4141
<WarningLevel>4</WarningLevel>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="Abp, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.0.7.1.0\lib\net451\Abp.dll</HintPath>
44+
<Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="Abp.AutoMapper, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Abp.AutoMapper.0.7.1.0\lib\net451\Abp.AutoMapper.dll</HintPath>
48+
<Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
52-
<Reference Include="Abp.Web, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Abp.Web.0.7.1.0\lib\net451\Abp.Web.dll</HintPath>
52+
<Reference Include="Abp.Web, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Abp.Web.0.7.3.0\lib\net451\Abp.Web.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="Abp.Web.Api, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Abp.Web.Api.0.7.1.0\lib\net451\Abp.Web.Api.dll</HintPath>
56+
<Reference Include="Abp.Web.Api, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Abp.Web.Api.0.7.2.0\lib\net451\Abp.Web.Api.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="Abp.Web.Mvc, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Abp.Web.Mvc.0.7.1.0\lib\net451\Abp.Web.Mvc.dll</HintPath>
60+
<Reference Include="Abp.Web.Mvc, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Abp.Web.Mvc.0.7.2.0\lib\net451\Abp.Web.Mvc.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -279,14 +279,14 @@
279279
<Content Include="fonts\glyphicons-halflings-regular.eot" />
280280
<Content Include="Content\bootstrap-theme.css.map" />
281281
<Content Include="Content\bootstrap.css.map" />
282-
<Content Include="Abp\Framework\styles\abp.mixings.less" />
283-
<Content Include="Abp\Framework\styles\abp.less" />
284-
<Content Include="Abp\Framework\styles\abp.css.map" />
285282
<Content Include="fonts\FontAwesome.otf" />
286283
<Content Include="fonts\fontawesome-webfont.woff2" />
287284
<Content Include="fonts\fontawesome-webfont.woff" />
288285
<Content Include="fonts\fontawesome-webfont.ttf" />
289286
<Content Include="fonts\fontawesome-webfont.eot" />
287+
<Content Include="Abp\Framework\styles\abp.mixings.less" />
288+
<Content Include="Abp\Framework\styles\abp.less" />
289+
<Content Include="Abp\Framework\styles\abp.css.map" />
290290
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
291291
<Content Include="Scripts\bootstrap.js" />
292292
<Content Include="Scripts\bootstrap.min.js" />

src/AbpCompanyName.AbpProjectName.WebMpa/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.7.1.0" targetFramework="net451" />
4-
<package id="Abp.AutoMapper" version="0.7.1.0" targetFramework="net451" />
5-
<package id="Abp.Web" version="0.7.1.0" targetFramework="net451" />
6-
<package id="Abp.Web.Api" version="0.7.1.0" targetFramework="net451" />
7-
<package id="Abp.Web.Mvc" version="0.7.1.0" targetFramework="net451" />
8-
<package id="Abp.Web.Resources" version="0.7.1.0" targetFramework="net451" />
3+
<package id="Abp" version="0.7.3.0" targetFramework="net451" />
4+
<package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
5+
<package id="Abp.Web" version="0.7.3.0" targetFramework="net451" />
6+
<package id="Abp.Web.Api" version="0.7.2.0" targetFramework="net451" />
7+
<package id="Abp.Web.Mvc" version="0.7.2.0" targetFramework="net451" />
8+
<package id="Abp.Web.Resources" version="0.7.2.0" targetFramework="net451" />
99
<package id="Antlr" version="3.5.0.2" targetFramework="net451" />
1010
<package id="AutoMapper" version="4.0.4" targetFramework="net451" />
1111
<package id="bootstrap" version="3.3.5" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Abp/Framework/scripts/abp.js

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,31 @@
102102
return true;
103103
};
104104

105+
/* FEATURE SYSTEM *********************************************/
106+
//Implements Features API that simplifies usage of feature scripts generated by Abp.
107+
108+
abp.features = abp.features || {};
109+
110+
abp.features.allFeatures = abp.features.allFeatures || {};
111+
112+
abp.features.get = function(name) {
113+
return abp.features.allFeatures[name];
114+
}
115+
116+
abp.features.getValue = function (name) {
117+
var feature = abp.features.get(name);
118+
if (feature == undefined) {
119+
return undefined;
120+
}
121+
122+
return feature.value;
123+
}
124+
125+
abp.features.isEnabled = function (name) {
126+
var value = abp.features.getValue(name);
127+
return value == 'true' || value == 'True';
128+
}
129+
105130
/* SETTINGS **************************************************/
106131
//Implements Settings API that simplifies usage of setting scripts generated by Abp.
107132

@@ -114,7 +139,8 @@
114139
};
115140

116141
abp.setting.getBoolean = function (name) {
117-
return abp.setting.values[name] == 'true';
142+
var value = abp.setting.get(name);
143+
return value == 'true' || value == 'True';
118144
};
119145

120146
abp.setting.getInt = function (name) {

0 commit comments

Comments
 (0)