ayan.poddar
/
eShopOnContainers
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 19 Wiki Activity
Browse Source

Fix Identity.API and WebMVC publishing 

- upgrade BundlerMinifier.Core dependencies (fixes a globbing bug)
- ensure minification includes all css
- only copy what's needed in production to the publish directory
pull/68/head
Charles Lowell 8 years ago
parent
7755f30618
commit
75d5c3695a
8 changed files with 44 additions and 35 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -13
      src/Services/Identity/Identity.API/Identity.API.csproj
  2. +10
    -2
      src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml
  3. +1
    -1
      src/Services/Identity/Identity.API/bundleconfig.json
  4. +1
    -1
      src/Web/WebMVC/Views/Shared/_Layout.cshtml
  5. +14
    -16
      src/Web/WebMVC/WebMVC.csproj
  6. +1
    -1
      src/Web/WebMVC/bundleconfig.json
  7. +0
    -1
      src/Web/WebMVC/wwwroot/css/app.min.css
  8. +1
    -0
      src/Web/WebMVC/wwwroot/css/site.min.css

+ 16
- 13
src/Services/Identity/Identity.API/Identity.API.csproj View File

@ -14,18 +14,17 @@
</PropertyGroup>
<ItemGroup>
<Content Update="wwwroot;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="web.config;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include=".dockerignore">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<None Include="wwwroot\css\*.min.css" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\fonts\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\images\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\js\*.min.js" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\*.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\bootstrap\dist\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\jquery*\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<Content Update="wwwroot\**\*;" CopyToPublishDirectory="Never" />
<Content Update="Views\**\*;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="web.config" CopyToPublishDirectory="PreserveNewest" />
<Content Update=".dockerignore" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
@ -66,7 +65,7 @@
</Target>
<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
@ -78,4 +77,8 @@
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\css\" />
</ItemGroup>
</Project>

+ 10
- 2
src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml View File

@ -6,8 +6,16 @@
<title>eShopOnContainers Identity</title>
<link rel="icon" type="image/x-icon" href="~/favicon.ico" />
<link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
<environment names="Development">
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
</environment>
<environment names="Staging,Production">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
</environment>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top es-header">


+ 1
- 1
src/Services/Identity/Identity.API/bundleconfig.json View File

@ -5,7 +5,7 @@
"outputFileName": "wwwroot/css/site.min.css",
// An array of relative input file paths. Globbing patterns supported
"inputFiles": [
"wwwroot/css/site.css",
"wwwroot/css/**/*.css"
]
},
{


+ 1
- 1
src/Web/WebMVC/Views/Shared/_Layout.cshtml View File

@ -23,7 +23,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
<link rel="stylesheet" href="~/css/app.min.css" asp-append-version="true" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
</environment>
</head>
<body>


+ 14
- 16
src/Web/WebMVC/WebMVC.csproj View File

@ -14,21 +14,19 @@
</PropertyGroup>
<ItemGroup>
<Content Update="wwwroot\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="Views\**\*;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="appsettings.json;">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update="web.config">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Update=".dockerignore">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<None Include="wwwroot\css\*.min.css" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\fonts\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\images\**\*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\js\*.min.js" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\*.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\bootstrap\dist\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\jquery*\**\*.min.*" CopyToPublishDirectory="PreserveNewest" />
<None Include="wwwroot\lib\tether\dist\**\*" CopyToPublishDirectory="PreserveNewest" />
<Content Update="wwwroot\**\*;" CopyToPublishDirectory="Never" />
<Content Update="Views\**\*;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="appsettings.json;" CopyToPublishDirectory="PreserveNewest" />
<Content Update="web.config" CopyToPublishDirectory="PreserveNewest" />
<Content Update=".dockerignore" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
@ -63,7 +61,7 @@
</Target>
<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
</ItemGroup>


+ 1
- 1
src/Web/WebMVC/bundleconfig.json View File

@ -5,7 +5,7 @@
"outputFileName": "wwwroot/css/site.min.css",
// An array of relative input file paths. Globbing patterns supported
"inputFiles": [
"wwwroot/css/site.css"
"wwwroot/css/**/*.css"
]
},
{


+ 0
- 1
src/Web/WebMVC/wwwroot/css/app.min.css
File diff suppressed because it is too large
View File


+ 1
- 0
src/Web/WebMVC/wwwroot/css/site.min.css
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save