Skip to content

Commit 364c07a

Browse files
ramon-tomas-cramon-tomas-c
committed
Included AspnetCore.all metapackage
1 parent c189078 commit 364c07a

6 files changed

Lines changed: 31 additions & 35 deletions

File tree

‎src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<PackageTargetFallback>$(PackageTargetFallback);net46</PackageTargetFallback>
65
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
76
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
87
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

‎src/Services/Catalog/Catalog.API/Catalog.API.csproj‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<AssemblyName>Catalog.API</AssemblyName>
88
<PackageId>Catalog.API</PackageId>
99
<UserSecretsId>aspnet-Catalog.API-20161122013618</UserSecretsId>
10-
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
1110
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
1211
</PropertyGroup>
1312

@@ -33,32 +32,13 @@
3332

3433
<ItemGroup>
3534
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
36-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
37-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
38-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
44-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
45-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
46-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
47-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
48-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
49-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
50-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
51-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
52-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
53-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
54-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
55-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
35+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
5636
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
5737
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
5838
</ItemGroup>
5939

6040
<ItemGroup>
61-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
41+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
6242
</ItemGroup>
6343

6444
<ItemGroup>

‎src/Services/Catalog/Catalog.API/Program.cs‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
using Microsoft.AspNetCore.Builder;
1+
using Microsoft.AspNetCore;
22
using Microsoft.AspNetCore.Hosting;
3+
using Microsoft.Extensions.Logging;
34
using System.IO;
45

56
namespace Microsoft.eShopOnContainers.Services.Catalog.API
@@ -8,16 +9,21 @@ public class Program
89
{
910
public static void Main(string[] args)
1011
{
11-
var host = new WebHostBuilder()
12-
.UseKestrel()
12+
BuildWebHost(args).Run();
13+
}
14+
15+
public static IWebHost BuildWebHost(string[] args) =>
16+
WebHost.CreateDefaultBuilder(args)
17+
.UseStartup<Startup>()
1318
.UseHealthChecks("/hc")
14-
.UseIISIntegration()
15-
.UseContentRoot(Directory.GetCurrentDirectory())
19+
.UseContentRoot(Directory.GetCurrentDirectory())
1620
.UseWebRoot("Pics")
17-
.UseStartup<Startup>()
18-
.Build();
19-
20-
host.Run();
21-
}
21+
.ConfigureLogging((hostingContext, builder) =>
22+
{
23+
builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
24+
builder.AddConsole();
25+
builder.AddDebug();
26+
})
27+
.Build();
2228
}
23-
}
29+
}

‎src/Services/Ordering/Ordering.API/Ordering.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
49+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
5050
</ItemGroup>
5151

5252
<ItemGroup>

‎src/Services/Ordering/Ordering.API/Program.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using Microsoft.AspNetCore;
22
using Microsoft.AspNetCore.Hosting;
3+
using Microsoft.Extensions.Logging;
4+
using System.IO;
35

46
namespace Microsoft.eShopOnContainers.Services.Ordering.API
57
{
@@ -13,6 +15,14 @@ public static void Main(string[] args)
1315
public static IWebHost BuildWebHost(string[] args) =>
1416
WebHost.CreateDefaultBuilder(args)
1517
.UseStartup<Startup>()
18+
.UseHealthChecks("/hc")
19+
.UseContentRoot(Directory.GetCurrentDirectory())
20+
.ConfigureLogging((hostingContext, builder) =>
21+
{
22+
builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
23+
builder.AddConsole();
24+
builder.AddDebug();
25+
})
1626
.Build();
1727
}
1828
}

‎src/Web/WebSPA/WebSPA.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
3132
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
3233
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0" />
3334
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />

0 commit comments

Comments
 (0)