Skip to content

Commit

Permalink
Merge pull request abpframework#40 from abpframework/maliming/upgrade…
Browse files Browse the repository at this point in the history
…_3.2

Upgrade samples to 3.2.1.
  • Loading branch information
realLiangshiwei authored Oct 14, 2020
2 parents 80db79f + 217849c commit 1c09715
Show file tree
Hide file tree
Showing 566 changed files with 10,144 additions and 48,760 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-dotnet@master
with:
dotnet-version: 3.1.100
dotnet-version: 3.1.102

- name: Build All
run: .\build-all.ps1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Account.Application" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="3.2.1" />
<ProjectReference Include="..\Acme.BookStore.Application.Contracts\Acme.BookStore.Application.Contracts.csproj" />
<ProjectReference Include="..\Acme.BookStore.EntityFrameworkCore.DbMigrations\Acme.BookStore.EntityFrameworkCore.DbMigrations.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="3.2.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="3.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.0.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.0.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.2.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="3.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.2.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.6" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

<ItemGroup>
<ProjectReference Include="..\Acme.BookStore.Domain\Acme.BookStore.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="3.0.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.0.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="3.2.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Acme.BookStore.Application\Acme.BookStore.Application.csproj" />
<ProjectReference Include="..\Acme.BookStore.HttpApi\Acme.BookStore.HttpApi.csproj" />
<ProjectReference Include="..\Acme.BookStore.EntityFrameworkCore.DbMigrations\Acme.BookStore.EntityFrameworkCore.DbMigrations.csproj" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="3.0.2" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.0.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="3.0.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="3.0.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="3.2.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="3.2.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="3.2.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="3.2.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="3.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="3.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~3.0.2"
"@abp/aspnetcore.mvc.ui.theme.basic": "~3.2.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ var abp = abp || {};
abp.security.antiForgery = abp.security.antiForgery || {};

abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN';
abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN';
abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken';

abp.security.antiForgery.getToken = function () {
return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
Expand All @@ -706,18 +706,18 @@ var abp = abp || {};

var toLocal = function (date) {
return new Date(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCSeconds(),
date.getUTCMilliseconds()
date.getFullYear(),
date.getMonth(),
date.getDate(),
date.getHours(),
date.getMinutes(),
date.getSeconds(),
date.getMilliseconds()
);
};

var toUtc = function (date) {
Date.UTC(
return Date.UTC(
date.getUTCFullYear(),
date.getUTCMonth(),
date.getUTCDate(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,15 @@ var abp = abp || {};
}
};

new MutationObserver(mutationObserverCallback).observe(
$('body')[0],
{
subtree: true,
childList: true
}
);
$(function(){
new MutationObserver(mutationObserverCallback).observe(
$('body')[0],
{
subtree: true,
childList: true
}
);
});

// AJAX ///////////////////////////////////////////////////////////////////

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
var abp = abp || {};
(function () {

if (!luxon) {
throw "abp/luxon library requires the luxon library included to the page!";
}

/* TIMING *************************************************/

abp.timing = abp.timing || {};

var setObjectValue = function (obj, property, value) {
if (typeof property === "string") {
property = property.split('.');
}

if (property.length > 1) {
var p = property.shift();
setObjectValue(obj[p], property, value);
} else {
obj[property[0]] = value;
}
}

var getObjectValue = function (obj, property) {
return property.split('.').reduce((a, v) => a[v], obj)
}

abp.timing.convertFieldsToIsoDate = function (form, fields) {
for (var field of fields) {
var dateTime = luxon.DateTime
.fromFormat(
getObjectValue(form, field),
abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
{locale: abp.localization.currentCulture.cultureName}
);

if (!dateTime.invalid) {
setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
}
}

return form;
}

})(jQuery);
Loading

0 comments on commit 1c09715

Please sign in to comment.