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

Fix Identity.API and WebMVC publishing

Browse Source 
- upgrade BundlerMinifier.Core dependencies (fixes a globbing bug)
- ensure minification includes all css
- only copy what's needed in production to the publish directory
This commit is contained in:
Charles Lowell 2017-02-24 11:21:28 -08:00
parent 7755f30618
commit 75d5c3695a
8 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Services/Identity/Identity.API/Identity.API.csproj
View File

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

12
src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml
View File

@ -6,8 +6,16 @@
<title>eShopOnContainers Identity</title> <title>eShopOnContainers Identity</title>
<link rel="icon" type="image/x-icon" href="~/favicon.ico" /> <link rel="icon" type="image/x-icon" href="~/favicon.ico" />
<link rel="shortcut 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" /> <environment names="Development">
<link rel="stylesheet" href="~/css/site.css" /> <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> </head>
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top es-header"> <div class="navbar navbar-inverse navbar-fixed-top es-header">

2
src/Services/Identity/Identity.API/bundleconfig.json
View File

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

2
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" <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-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" /> 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> </environment>
</head> </head>
<body> <body>

30
src/Web/WebMVC/WebMVC.csproj
View File

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

2
src/Web/WebMVC/bundleconfig.json
View File

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

1
src/Web/WebMVC/wwwroot/css/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
src/Web/WebMVC/wwwroot/css/site.min.css vendored
View File

File diff suppressed because one or more lines are too long