Skip to content

Commit 61910c8

Browse files
yekalkanyekalkan
committed
Resolved #128
1 parent fb5f7db commit 61910c8

File tree

8 files changed

+50
-23
lines changed

8 files changed

+50
-23
lines changed

‎angular/yarn.lock

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,14 @@
217217
dependencies:
218218
moment "*"
219219

220-
"@types/node@^6.0.42", "@types/node@^6.0.46":
220+
"@types/node@^6.0.46":
221221
version "6.0.88"
222222
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
223223

224+
"@types/node@^8.0.27":
225+
version "8.0.34"
226+
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.34.tgz#55f801fa2ddb2a40dd6dfc15ecfe1dde9c129fe9"
227+
224228
"@types/q@^0.0.32":
225229
version "0.0.32"
226230
resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -6044,7 +6048,11 @@ typedarray@^0.0.6:
60446048
version "0.0.6"
60456049
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
60466050

6047-
[email protected], "typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
6051+
[email protected]:
6052+
version "2.5.3"
6053+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
6054+
6055+
"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
60486056
version "2.5.2"
60496057
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
60506058

@@ -6282,6 +6290,10 @@ wcwidth@^1.0.0:
62826290
dependencies:
62836291
defaults "^1.0.3"
62846292

6293+
web-animations-js@^2.3.1:
6294+
version "2.3.1"
6295+
resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
6296+
62856297
webdriver-js-extender@^1.0.0:
62866298
version "1.0.0"
62876299
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@@ -6614,6 +6626,10 @@ yn@^2.0.0:
66146626
version "2.0.0"
66156627
resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
66166628

6617-
[email protected], zone.js@^0.8.14:
6629+
[email protected]:
6630+
version "0.8.18"
6631+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.18.tgz#8cecb3977fcd1b3090562ff4570e2847e752b48d"
6632+
6633+
zone.js@^0.8.14:
66186634
version "0.8.17"
66196635
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.17.tgz#4c5e5185a857da8da793daf3919371c5a36b2a0b"

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp" Version="3.0.0" />
22-
<PackageReference Include="Abp.AutoMapper" Version="3.0.0" />
23-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.0.0" />
21+
<PackageReference Include="Abp" Version="3.1.0" />
22+
<PackageReference Include="Abp.AutoMapper" Version="3.1.0" />
23+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.1.0" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Migrations/AbpProjectNameDbContextModelSnapshot.cs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
using System;
1+
// <auto-generated />
2+
using Abp.Authorization;
3+
using Abp.BackgroundJobs;
4+
using Abp.Notifications;
5+
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
26
using Microsoft.EntityFrameworkCore;
37
using Microsoft.EntityFrameworkCore.Infrastructure;
48
using Microsoft.EntityFrameworkCore.Metadata;
5-
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
9+
using Microsoft.EntityFrameworkCore.Migrations;
10+
using Microsoft.EntityFrameworkCore.Storage;
11+
using Microsoft.EntityFrameworkCore.Storage.Internal;
12+
using Microsoft.EntityFrameworkCore.ValueGeneration;
13+
using System;
614

715
namespace AbpCompanyName.AbpProjectName.Migrations
816
{
@@ -11,8 +19,9 @@ partial class AbpProjectNameDbContextModelSnapshot : ModelSnapshot
1119
{
1220
protected override void BuildModel(ModelBuilder modelBuilder)
1321
{
22+
#pragma warning disable 612, 618
1423
modelBuilder
15-
.HasAnnotation("ProductVersion", "1.1.2")
24+
.HasAnnotation("ProductVersion", "2.0.0-rtm-26452")
1625
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
1726

1827
modelBuilder.Entity("Abp.Application.Editions.Edition", b =>
@@ -63,6 +72,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
6372
.IsRequired()
6473
.HasMaxLength(128);
6574

75+
b.Property<int?>("TenantId");
76+
6677
b.Property<string>("Value")
6778
.IsRequired()
6879
.HasMaxLength(2000);
@@ -937,7 +948,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
937948
{
938949
b.HasBaseType("Abp.Application.Features.FeatureSetting");
939950

940-
b.Property<int>("TenantId");
941951

942952
b.HasIndex("TenantId", "Name");
943953

@@ -1098,6 +1108,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
10981108
.HasForeignKey("UserId")
10991109
.OnDelete(DeleteBehavior.Cascade);
11001110
});
1111+
#pragma warning restore 612, 618
11011112
}
11021113
}
11031114
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
3333
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
3434
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
35-
<PackageReference Include="Abp.AspNetCore" Version="3.0.0" />
36-
<PackageReference Include="Abp.ZeroCore" Version="3.0.0" />
35+
<PackageReference Include="Abp.AspNetCore" Version="3.1.0" />
36+
<PackageReference Include="Abp.ZeroCore" Version="3.1.0" />
3737
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4141
<Reference Include="System" />
4242
<Reference Include="Microsoft.CSharp" />
4343

44-
<PackageReference Include="Abp.Web.SignalR" Version="3.0.0" />
45-
<PackageReference Include="Abp.Owin" Version="3.0.0" />
44+
<PackageReference Include="Abp.Web.SignalR" Version="3.1.0" />
45+
<PackageReference Include="Abp.Owin" Version="3.1.0" />
4646
</ItemGroup>
4747

4848
</Project>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
39-
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.0.0" />
39+
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
4040
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
4141
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
4242
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</PackageReference>
4141
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.1" />
4242
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.1" />
43-
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.0.0" />
43+
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
4444
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0" />
4545
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.0" />
4646
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
@@ -51,9 +51,9 @@
5151
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
5252
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
5353
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
54-
<PackageReference Include="Abp.HangFire" Version="3.0.0" />
55-
<PackageReference Include="Abp.RedisCache" Version="3.0.0" />
56-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0" />
54+
<PackageReference Include="Abp.HangFire" Version="3.1.0" />
55+
<PackageReference Include="Abp.RedisCache" Version="3.1.0" />
56+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.0" />
5757
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
5858
</ItemGroup>
5959

‎aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<PackageReference Include="xunit" Version="2.2.0" />
2525
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
27-
<PackageReference Include="Abp.TestBase" Version="3.0.0" />
27+
<PackageReference Include="Abp.TestBase" Version="3.1.0" />
2828
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
29-
<PackageReference Include="Castle.Core" Version="4.1.1" />
29+
<PackageReference Include="Castle.Core" Version="4.2.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

0 commit comments

Comments
 (0)