Browse Source

Merge pull request #78 from dotnet/glennc/ci

a couple of quick changes to allow building in the docker-compose.ci.…
pull/101/head
Cesar De la Torre 8 years ago
committed by GitHub
parent
commit
aa7939671d
6 changed files with 7 additions and 6 deletions
  1. +1
    -1
      NuGet.config
  2. +1
    -1
      src/Services/Identity/Identity.API/Identity.API.csproj
  3. +1
    -1
      src/Services/Identity/Identity.API/wwwroot/css/site.min.css
  4. +1
    -1
      src/Web/WebMVC/WebMVC.csproj
  5. +1
    -1
      src/Web/WebMVC/wwwroot/css/site.min.css
  6. +2
    -1
      test/Services/FunctionalTests/FunctionalTests.csproj

+ 1
- 1
NuGet.config View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

+ 1
- 1
src/Services/Identity/Identity.API/Identity.API.csproj View File

@ -60,7 +60,7 @@
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="bower install" />
<Exec Command="bower install --allow-root" />
<Exec Command="dotnet bundle" />
</Target>


+ 1
- 1
src/Services/Identity/Identity.API/wwwroot/css/site.min.css
File diff suppressed because it is too large
View File


+ 1
- 1
src/Web/WebMVC/WebMVC.csproj View File

@ -40,7 +40,7 @@
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="bower install" />
<Exec Command="bower install --allow-root" />
<Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" />
</Target>


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


+ 2
- 1
test/Services/FunctionalTests/FunctionalTests.csproj View File

@ -13,7 +13,8 @@
</PropertyGroup>
<ItemGroup>
<Content Include="settings.json;web.config">
<!--<Content Include="settings.json;web.config">-->
<Content Include="settings.json">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>


Loading…
Cancel
Save