Skip to content

Commit d03a068

Browse files
fretjefretje
committed
merge with upstream/master
2 parents 9e63be5 + 00ffc90 commit d03a068

File tree

10 files changed

+51
-27
lines changed

10 files changed

+51
-27
lines changed

‎angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"@types/moment-timezone": "^0.2.34",
3232
"@types/signalr": "^2.2.33",
3333
"@types/toastr": "^2.1.33",
34-
"abp-ng2-module": "^1.2.0",
35-
"abp-web-resources": "^2.2.1",
34+
"abp-ng2-module": "^1.2.4",
35+
"abp-web-resources": "^3.1.0",
3636
"animate.css": "^3.5.2",
3737
"block-ui": "^2.70.1",
3838
"bootstrap": "^3.3.7",

‎angular/yarn.lock

Lines changed: 26 additions & 6 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"
@@ -249,9 +253,9 @@ abbrev@~1.0.9:
249253
version "1.0.9"
250254
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
251255

252-
abp-ng2-module@^1.2.0:
253-
version "1.2.0"
254-
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.0.tgz#9f4c70453e18d777bdffe3d6510522110a4e3587"
256+
abp-ng2-module@^1.2.4:
257+
version "1.2.4"
258+
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.4.tgz#74fa5f082f74d6cfbc39003f73da41869f33a567"
255259
dependencies:
256260
"@angular/core" "^4.0.0"
257261
"@angular/http" "^4.0.0"
@@ -261,6 +265,10 @@ abp-web-resources@^2.2.1:
261265
version "2.2.1"
262266
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.2.1.tgz#0877e7743a99b2de8fca8d4476517b48db2bda87"
263267

268+
abp-web-resources@^3.1.0:
269+
version "3.1.0"
270+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.1.0.tgz#3df4f89e4e8eff62059eb7399db021fb16331230"
271+
264272
[email protected]:
265273
version "1.3.3"
266274
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
@@ -6044,7 +6052,11 @@ typedarray@^0.0.6:
60446052
version "0.0.6"
60456053
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
60466054

6047-
[email protected], "typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
6055+
[email protected]:
6056+
version "2.5.3"
6057+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
6058+
6059+
"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
60486060
version "2.5.2"
60496061
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
60506062

@@ -6282,6 +6294,10 @@ wcwidth@^1.0.0:
62826294
dependencies:
62836295
defaults "^1.0.3"
62846296

6297+
web-animations-js@^2.3.1:
6298+
version "2.3.1"
6299+
resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
6300+
62856301
webdriver-js-extender@^1.0.0:
62866302
version "1.0.0"
62876303
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@@ -6614,6 +6630,10 @@ yn@^2.0.0:
66146630
version "2.0.0"
66156631
resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
66166632

6617-
[email protected], zone.js@^0.8.14:
6633+
[email protected]:
6634+
version "0.8.18"
6635+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.18.tgz#8cecb3977fcd1b3090562ff4570e2847e752b48d"
6636+
6637+
zone.js@^0.8.14:
66186638
version "0.8.17"
66196639
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

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

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
// <auto-generated />
2+
using System;
23
using Microsoft.EntityFrameworkCore;
34
using Microsoft.EntityFrameworkCore.Infrastructure;
45
using Microsoft.EntityFrameworkCore.Metadata;
@@ -11,8 +12,9 @@ partial class AbpProjectNameDbContextModelSnapshot : ModelSnapshot
1112
{
1213
protected override void BuildModel(ModelBuilder modelBuilder)
1314
{
15+
#pragma warning disable 612, 618
1416
modelBuilder
15-
.HasAnnotation("ProductVersion", "1.1.2")
17+
.HasAnnotation("ProductVersion", "2.0.0-rtm-26452")
1618
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
1719

1820
modelBuilder.Entity("Abp.Application.Editions.Edition", b =>
@@ -63,6 +65,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
6365
.IsRequired()
6466
.HasMaxLength(128);
6567

68+
b.Property<int?>("TenantId");
69+
6670
b.Property<string>("Value")
6771
.IsRequired()
6872
.HasMaxLength(2000);
@@ -937,7 +941,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
937941
{
938942
b.HasBaseType("Abp.Application.Features.FeatureSetting");
939943

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

942945
b.HasIndex("TenantId", "Name");
943946

@@ -1098,6 +1101,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
10981101
.HasForeignKey("UserId")
10991102
.OnDelete(DeleteBehavior.Cascade);
11001103
});
1104+
#pragma warning restore 612, 618
11011105
}
11021106
}
11031107
}

‎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.1" />
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
@@ -31,17 +31,17 @@
3131
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
3232
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
3333
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
34-
<PackageReference Include="Abp.AspNetCore" Version="3.0.0" />
35-
<PackageReference Include="Abp.ZeroCore" Version="3.0.0" />
34+
<PackageReference Include="Abp.AspNetCore" Version="3.1.1" />
35+
<PackageReference Include="Abp.ZeroCore" Version="3.1.1" />
3636
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
3737
</ItemGroup>
3838

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

43-
<PackageReference Include="Abp.Web.SignalR" Version="3.0.0" />
44-
<PackageReference Include="Abp.Owin" Version="3.0.0" />
43+
<PackageReference Include="Abp.Web.SignalR" Version="3.1.1" />
44+
<PackageReference Include="Abp.Owin" Version="3.1.1" />
4545
</ItemGroup>
4646

4747
</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.1" />
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.1" />
55+
<PackageReference Include="Abp.RedisCache" Version="3.1.1" />
56+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.1.1" />
5757
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
5858
</ItemGroup>
5959

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"chart.js": "chartjs#^2.6.0",
2727
"jquery-sparkline": "^2.1.3",
2828
"Flot": "jquery-flot#^0.8.3",
29-
"abp-web-resources": "^2.2.1"
29+
"abp-web-resources": "^3.1.0"
3030
}
3131
}

‎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.1" />
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)