From 3d2964693626845a1a9d453f26365fbb7e1d51a3 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 23 Oct 2018 11:46:53 +0800 Subject: [PATCH 1/2] Cross-platform path and project reference path. --- .../Volo/Utils/SolutionTemplating/SolutionBuilder.cs | 3 ++- .../Volo.Abp.AuditLogging.Domain.Shared.csproj | 2 +- .../Volo.Blogging.HttpApi.Client.csproj | 2 +- .../src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj | 2 +- .../blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj | 4 ++-- .../Volo.Abp.IdentityServer.Domain.Shared.csproj | 4 ++-- .../Volo.Abp.IdentityServer.Domain.csproj | 6 +++--- .../Volo.Abp.IdentityServer.EntityFrameworkCore.csproj | 2 +- .../Volo.Abp.IdentityServer.MongoDB.csproj | 2 +- ...Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj | 6 +++--- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/SolutionBuilder.cs b/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/SolutionBuilder.cs index 4a1775f0e2..6670c8bba9 100644 --- a/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/SolutionBuilder.cs +++ b/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/SolutionBuilder.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; @@ -30,7 +31,7 @@ namespace Volo.Utils.SolutionTemplating { var stopwatch = Stopwatch.StartNew(); - var templateRootPath = _hostingEnvironment.ContentRootPath + "\\TemplateFiles"; //TODO: To another folder that is not in the deployment folder! + var templateRootPath = Path.Combine(_hostingEnvironment.ContentRootPath, "TemplateFiles"); //TODO: To another folder that is not in the deployment folder! var solutionName = SolutionName.Parse(companyAndProjectName); var context = new ProjectBuildContext( diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj index 8659dd7bab..b1d7f04bbf 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo.Abp.AuditLogging.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj index a0ac8349e2..a736b41226 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj +++ b/modules/blogging/src/Volo.Blogging.HttpApi.Client/Volo.Blogging.HttpApi.Client.csproj @@ -11,7 +11,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj index dc82611952..b9c9f3933b 100644 --- a/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj +++ b/modules/blogging/src/Volo.Blogging.HttpApi/Volo.Blogging.HttpApi.csproj @@ -11,7 +11,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj index fa60f22a34..6000771e97 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.csproj index 5ea41c91c1..8964af3fcb 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo.Abp.IdentityServer.Domain.Shared.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj index ba1008e94c..fc2969a97b 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj index 7392aa8ff8..ec2eb3e809 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo.Abp.IdentityServer.EntityFrameworkCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj index aaf4117f0f..4c3c98f6bf 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo.Abp.IdentityServer.MongoDB.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj index 3c177cda81..4b54ab30be 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj @@ -14,10 +14,10 @@ - + - - + + From 3770d47271d16fef1b57bf1aa16160f268a5e9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=A3=AB=E4=BC=9F?= Date: Tue, 23 Oct 2018 15:42:11 +0800 Subject: [PATCH 2/2] rename headerviewComponent.cs --- .../Header/{FooterViewComponent.cs => HeaderViewComponent.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/{FooterViewComponent.cs => HeaderViewComponent.cs} (100%) diff --git a/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/FooterViewComponent.cs b/abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/HeaderViewComponent.cs similarity index 100% rename from abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/FooterViewComponent.cs rename to abp_io/src/Volo.AbpWebSite.Web/Pages/Shared/Components/Header/HeaderViewComponent.cs