Browse Source

Tested application by publishing.

pull/183/head
Halil İbrahim Kalkan 8 years ago
parent
commit
1bbc6138cb
  1. 14
      src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
  2. 18
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs
  3. 9
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
  4. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap-bundle-min-js.map
  5. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap-bundle-min.js
  6. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables-min.css
  7. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables-min.js
  8. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/font-awesome/css/font-awesome-min.css
  9. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-form/jquery-form-min.js
  10. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.js
  11. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.min.js
  12. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation/jquery-validate.js
  13. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3-1-1-min.js
  14. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3-1-1-min.map
  15. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/css/material-min.css
  16. 0
      src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/js/material-min.js
  17. 16
      src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
  18. 3
      src/Volo.Abp.VirtualFileSystem/Properties/AssemblyInfo.cs
  19. 13
      src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFilePathHelper.cs
  20. 2
      test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj
  21. 1
      test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/MyResources/js/jquery-3-1-1-min.js
  22. 1
      test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/MyResources/js/jquery-3.1.1.min.js
  23. 14
      test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFilePathHelper_Tests.cs
  24. 8
      test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs

14
src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs

@ -86,13 +86,13 @@ namespace AbpDesk.Web.Mvc
if (env.IsDevelopment())
{
services.Configure<VirtualFileSystemOptions>(options =>
{
options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.AspNetCore.Mvc.UI"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpAccountWebModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.Account.Web"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpIdentityWebModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.Identity.Web"));
});
//services.Configure<VirtualFileSystemOptions>(options =>
//{
// options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.AspNetCore.Mvc.UI"));
// options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"));
// options.FileSets.ReplaceEmbeddedByPyhsical<AbpAccountWebModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.Account.Web"));
// options.FileSets.ReplaceEmbeddedByPyhsical<AbpIdentityWebModule>(Path.Combine(env.ContentRootPath, "..\\..\\Volo.Abp.Identity.Web"));
//});
}
}

18
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs

@ -29,21 +29,21 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
{
options.StyleBundles.Add("GlobalStyles", new[]
{
"/libs/font-awesome/css/font-awesome.min.css",
"/libs/material/css/material.min.css",
"/libs/font-awesome/css/font-awesome-min.css",
"/libs/material/css/material-min.css",
"/libs/datatables/datatables.css",
"/styles/libs/datatables.css"
});
options.ScriptBundles.Add("GlobalScripts", new[]
{
"/libs/jquery/jquery-3.1.1.min.js",
"/libs/bootstrap/js/bootstrap.bundle.min.js",
"/libs/jquery-validation/jquery.validate.js",
"/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
"/libs/jquery-form/jquery.form.min.js",
"/libs/material/js/material.min.js",
"/libs/datatables/datatables.min.js",
"/libs/jquery/jquery-3-1-1-min.js",
"/libs/bootstrap/js/bootstrap-bundle-min.js",
"/libs/jquery-validation/jquery-validate.js",
"/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.js",
"/libs/jquery-form/jquery-form-min.js",
"/libs/material/js/material-min.js",
"/libs/datatables/datatables-min.js",
"/libs/vue/vue.js",
"/libs/abp/abp-jquery.js?_v" + DateTime.Now.Ticks
});

9
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

@ -9,15 +9,6 @@
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
</PropertyGroup>
<ItemGroup>
<Content Include="Localization\Resources\AbpBootstrap\tr.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Localization\Resources\AbpBootstrap\en.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\Resources\**\*.json" />
<EmbeddedResource Include="Views\**\*.cshtml" />

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap-bundle-min-js.map

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap-bundle-min.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables.min.css → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables-min.css

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/datatables/datatables-min.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/font-awesome/css/font-awesome.min.css → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/font-awesome/css/font-awesome-min.css

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-form/jquery.form.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-form/jquery-form-min.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation-unobtrusive/jquery-validate-unobtrusive.min.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation/jquery.validate.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery-validation/jquery-validate.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3.1.1.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3-1-1-min.js

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3.1.1.min.map → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/jquery/jquery-3-1-1-min.map

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/css/material.min.css → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/css/material-min.css

0
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/js/material.min.js → src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/material/js/material-min.js

16
src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@ -16,26 +16,10 @@
<EmbeddedResource Include="Localization\Resources\**\*.json" />
</ItemGroup>
<ItemGroup>
<Content Remove="Pages\Identity\Users\EditModal.cshtml" />
<Content Remove="Pages\Identity\_ViewImports.cshtml" />
<Content Remove="wwwroot\modules\identity\helpers\ModalManager.js" />
<Content Remove="wwwroot\modules\identity\helpers\ResourceLoader.js" />
</ItemGroup>
<ItemGroup>
<None Remove="wwwroot\modules\identity\helpers\datatables_helper.js" />
<None Remove="wwwroot\modules\identity\helpers\jquery.js" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
<ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\modules\identity\libs\" />
</ItemGroup>
</Project>

3
src/Volo.Abp.VirtualFileSystem/Properties/AssemblyInfo.cs

@ -0,0 +1,3 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Volo.Abp.VirtualFileSystem.Tests")]

13
src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFilePathHelper.cs

@ -1,9 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Volo.Abp.VirtualFileSystem
{
internal static class VirtualFilePathHelper
{
//TODO: Optimize this class!
public static string NormalizePath(string fullPath)
{
var fileName = fullPath;
@ -28,7 +32,14 @@ namespace Volo.Abp.VirtualFileSystem
private static string NormalizeChars(string fileName)
{
return fileName.Replace(".", "/");
var folderParts = fileName.Replace(".", "/").Split("/");
if (folderParts.Length == 1)
{
return folderParts[0];
}
return folderParts.Take(folderParts.Length - 1).Select(s => s.Replace("-", "_")).JoinAsString("/") + "/" + folderParts.Last();
}
}
}

2
test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Volo\Abp\VirtualFileSystem\MyResources\js\jquery-3.1.1.min.js" />
<EmbeddedResource Include="Volo\Abp\VirtualFileSystem\MyResources\js\jquery-3-1-1-min.js" />
</ItemGroup>
<ItemGroup>

1
test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/MyResources/js/jquery-3-1-1-min.js

@ -0,0 +1 @@
//jquery-3-1-1-min.js-contents

1
test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/MyResources/js/jquery-3.1.1.min.js

@ -1 +0,0 @@
//jquery-3.1.1.min.js-contents

14
test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFilePathHelper_Tests.cs

@ -0,0 +1,14 @@
using Shouldly;
using Xunit;
namespace Volo.Abp.VirtualFileSystem
{
public class VirtualFilePathHelper_Tests
{
[Fact]
public void NormalizePath()
{
VirtualFilePathHelper.NormalizePath("~/test-one/test-two/test-three.js").ShouldBe("~/test_one/test_two/test-three.js");
}
}
}

8
test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/EmbeddedFileManager_Tests.cs → test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs

@ -8,11 +8,11 @@ using Xunit;
namespace Volo.Abp.VirtualFileSystem
{
public class EmbeddedFileManager_Tests : AbpIntegratedTest<EmbeddedFileManager_Tests.TestModule>
public class VirtualFileProvider_Tests : AbpIntegratedTest<VirtualFileProvider_Tests.TestModule>
{
private readonly IVirtualFileProvider _embeddedFileManager;
public EmbeddedFileManager_Tests()
public VirtualFileProvider_Tests()
{
_embeddedFileManager = ServiceProvider.GetRequiredService<IVirtualFileProvider>();
}
@ -21,7 +21,7 @@ namespace Volo.Abp.VirtualFileSystem
public void Should_Define_And_Get_Embedded_Resources()
{
//Act
var resource = _embeddedFileManager.GetFileInfo("/js/jquery-3.1.1.min.js");
var resource = _embeddedFileManager.GetFileInfo("/js/jquery-3-1-1-min.js");
//Assert
resource.ShouldNotBeNull();
@ -29,7 +29,7 @@ namespace Volo.Abp.VirtualFileSystem
using (var stream = resource.CreateReadStream())
{
Encoding.UTF8.GetString(stream.GetAllBytes()).ShouldBe("//jquery-3.1.1.min.js-contents");
Encoding.UTF8.GetString(stream.GetAllBytes()).ShouldBe("//jquery-3-1-1-min.js-contents");
}
}
Loading…
Cancel
Save