Skip to content

Commit 1a0a757

Browse files
ismcagdasismcagdas
committed
Merge branch 'master' into pr/88
2 parents 8ecaeb9 + 405246e commit 1a0a757

File tree

19 files changed

+457
-449
lines changed

19 files changed

+457
-449
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.4.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.4.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
4444
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4545
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>

‎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="4.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="4.2.0" targetFramework="net461" />
3+
<package id="Abp" version="4.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="4.3.0" targetFramework="net461" />
55
<package id="AutoMapper" version="8.0.0" targetFramework="net461" />
66
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
77
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4242
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>

‎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="4.2.0" targetFramework="net461" />
3+
<package id="Abp" version="4.3.0" targetFramework="net461" />
44
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
55
<package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net461" />
66
<package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.EntityFramework, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.4.2.0\lib\net461\Abp.EntityFramework.dll</HintPath>
41+
<Reference Include="Abp.EntityFramework, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.4.3.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.4.2.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.4.3.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/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="4.2.0" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="4.2.0" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.Common" version="4.2.0" targetFramework="net461" />
3+
<package id="Abp" version="4.3.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="4.3.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.Common" version="4.3.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net461" />
88
<package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.FluentMigrator, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.FluentMigrator.4.2.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
41+
<Reference Include="Abp.FluentMigrator, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.FluentMigrator.4.3.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.NHibernate, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.NHibernate.4.2.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
44+
<Reference Include="Abp.NHibernate, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.NHibernate.4.3.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>

‎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="4.2.0" targetFramework="net461" />
4-
<package id="Abp.FluentMigrator" version="4.2.0" targetFramework="net461" />
5-
<package id="Abp.NHibernate" version="4.2.0" targetFramework="net461" />
3+
<package id="Abp" version="4.3.0" targetFramework="net461" />
4+
<package id="Abp.FluentMigrator" version="4.3.0" targetFramework="net461" />
5+
<package id="Abp.NHibernate" version="4.3.0" targetFramework="net461" />
66
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
77
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net461" />

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.4.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.4.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Web, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Web.4.2.0\lib\net461\Abp.Web.dll</HintPath>
44+
<Reference Include="Abp.Web, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Web.4.3.0\lib\net461\Abp.Web.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Web.Api, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Web.Api.4.2.0\lib\net461\Abp.Web.Api.dll</HintPath>
47+
<Reference Include="Abp.Web.Api, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Web.Api.4.3.0\lib\net461\Abp.Web.Api.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Abp.Web.Common, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Web.Common.4.2.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
50+
<Reference Include="Abp.Web.Common, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Web.Common.4.3.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
5252
</Reference>
5353
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5454
<HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
@@ -125,6 +125,9 @@
125125
<Reference Include="Nito.Disposables, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
126126
<HintPath>..\packages\Nito.Disposables.2.0.0\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
127127
</Reference>
128+
<Reference Include="NUglify, Version=1.5.12.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
129+
<HintPath>..\packages\NUglify.1.5.12\lib\net40\NUglify.dll</HintPath>
130+
</Reference>
128131
<Reference Include="System" />
129132
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
130133
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.WebApi/packages.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="4.2.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="4.2.0" targetFramework="net461" />
5-
<package id="Abp.Web" version="4.2.0" targetFramework="net461" />
6-
<package id="Abp.Web.Api" version="4.2.0" targetFramework="net461" />
7-
<package id="Abp.Web.Common" version="4.2.0" targetFramework="net461" />
3+
<package id="Abp" version="4.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="4.3.0" targetFramework="net461" />
5+
<package id="Abp.Web" version="4.3.0" targetFramework="net461" />
6+
<package id="Abp.Web.Api" version="4.3.0" targetFramework="net461" />
7+
<package id="Abp.Web.Common" version="4.3.0" targetFramework="net461" />
88
<package id="AutoMapper" version="8.0.0" targetFramework="net461" />
99
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
1010
<package id="Castle.Core" version="4.3.1" targetFramework="net461" />
@@ -30,6 +30,7 @@
3030
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
3131
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
3232
<package id="Nito.Disposables" version="2.0.0" targetFramework="net461" />
33+
<package id="NUglify" version="1.5.12" targetFramework="net461" />
3334
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
3435
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
3536
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/libs/abp.signalr-client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ var abp = abp || {};
102102
abp.signalr.autoConnect = true;
103103
}
104104

105-
if (abp.signalr.autoConnect) {
105+
if (abp.signalr.autoConnect && !abp.signalr.hubs.common) {
106106
abp.signalr.connect();
107107
}
108108

‎src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/libs/abp.signalr-client.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,26 @@
6565
<WarningLevel>4</WarningLevel>
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="Abp, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Abp.4.2.0\lib\netstandard2.0\Abp.dll</HintPath>
68+
<Reference Include="Abp, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Abp.4.3.0\lib\netstandard2.0\Abp.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Abp.AutoMapper, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Abp.AutoMapper.4.2.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
71+
<Reference Include="Abp.AutoMapper, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Abp.AutoMapper.4.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Abp.Castle.Log4Net, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Abp.Castle.Log4Net.4.2.0\lib\netstandard2.0\Abp.Castle.Log4Net.dll</HintPath>
74+
<Reference Include="Abp.Castle.Log4Net, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Abp.Castle.Log4Net.4.3.0\lib\netstandard2.0\Abp.Castle.Log4Net.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Abp.Web, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Abp.Web.4.2.0\lib\net461\Abp.Web.dll</HintPath>
77+
<Reference Include="Abp.Web, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Abp.Web.4.3.0\lib\net461\Abp.Web.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Abp.Web.Api, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Abp.Web.Api.4.2.0\lib\net461\Abp.Web.Api.dll</HintPath>
80+
<Reference Include="Abp.Web.Api, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Abp.Web.Api.4.3.0\lib\net461\Abp.Web.Api.dll</HintPath>
8282
</Reference>
83-
<Reference Include="Abp.Web.Common, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Abp.Web.Common.4.2.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
83+
<Reference Include="Abp.Web.Common, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Abp.Web.Common.4.3.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Abp.Web.Mvc, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Abp.Web.Mvc.4.2.0\lib\net461\Abp.Web.Mvc.dll</HintPath>
86+
<Reference Include="Abp.Web.Mvc, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Abp.Web.Mvc.4.3.0\lib\net461\Abp.Web.Mvc.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
9090
<SpecificVersion>False</SpecificVersion>
@@ -193,8 +193,8 @@
193193
<Reference Include="Nito.Disposables, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
194194
<HintPath>..\packages\Nito.Disposables.2.0.0\lib\netstandard2.0\Nito.Disposables.dll</HintPath>
195195
</Reference>
196-
<Reference Include="NUglify, Version=1.5.11.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
197-
<HintPath>..\packages\NUglify.1.5.11\lib\net40\NUglify.dll</HintPath>
196+
<Reference Include="NUglify, Version=1.5.12.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
197+
<HintPath>..\packages\NUglify.1.5.12\lib\net40\NUglify.dll</HintPath>
198198
</Reference>
199199
<Reference Include="System.AppContext">
200200
<HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>

0 commit comments

Comments
 (0)