Skip to content

Commit 73a0b1e

Browse files
joeaudettejoeaudette
committed
2.0 rtm updates
1 parent 83b2d2e commit 73a0b1e

5 files changed

Lines changed: 27 additions & 53 deletions

File tree

‎src/WebLib/WebLib.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.0-*" />
18-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0-*" />
19-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.0.0-*" />
20-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="2.0.0-*" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.*" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.*" />
19+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.0.*" />
20+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="2.0.*" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/cloudscribe.Web.Localization/cloudscribe.Web.Localization.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<Description>more flexible localization for ASP.NET Core</Description>
55
<VersionPrefix>2.0.0</VersionPrefix>
6-
<VersionSuffix>preview20170725</VersionSuffix>
76
<Authors>Joe Audette</Authors>
87
<TargetFrameworks>netstandard2.0</TargetFrameworks>
98
<AssemblyName>cloudscribe.Web.Localization</AssemblyName>
@@ -18,9 +17,9 @@
1817
</PropertyGroup>
1918

2019
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0-*" />
22-
<PackageReference Include="Microsoft.Extensions.Localization" Version="2.0.0-*" />
23-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0-*" />
20+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.*" />
21+
<PackageReference Include="Microsoft.Extensions.Localization" Version="2.0.*" />
22+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.*" />
2423
</ItemGroup>
2524

2625

‎src/localization.WebApp/Program.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
using System.IO;
44
using System.Linq;
55
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore;
67
using Microsoft.AspNetCore.Hosting;
8+
using Microsoft.Extensions.Configuration;
9+
using Microsoft.Extensions.Logging;
710

811
namespace localization.WebApp
912
{
1013
public class Program
1114
{
1215
public static void Main(string[] args)
1316
{
14-
var host = new WebHostBuilder()
15-
.UseKestrel()
16-
.UseContentRoot(Directory.GetCurrentDirectory())
17-
.UseIISIntegration()
17+
BuildWebHost(args).Run();
18+
}
19+
20+
public static IWebHost BuildWebHost(string[] args) =>
21+
WebHost.CreateDefaultBuilder(args)
1822
.UseStartup<Startup>()
1923
.Build();
20-
21-
host.Run();
22-
}
2324
}
2425
}

‎src/localization.WebApp/Startup.cs‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,12 @@ namespace localization.WebApp
2121
{
2222
public class Startup
2323
{
24-
public Startup(IHostingEnvironment env)
25-
{
26-
var builder = new ConfigurationBuilder()
27-
.SetBasePath(env.ContentRootPath)
28-
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
29-
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
30-
31-
32-
33-
builder.AddEnvironmentVariables();
34-
Configuration = builder.Build();
24+
public Startup(IConfiguration configuration, IHostingEnvironment env)
25+
{
26+
Configuration =configuration;
3527
}
3628

37-
public IConfigurationRoot Configuration { get; }
29+
public IConfiguration Configuration { get; }
3830

3931
// This method gets called by the runtime. Use this method to add services to the container.
4032
public void ConfigureServices(IServiceCollection services)
@@ -97,14 +89,12 @@ public void ConfigureServices(IServiceCollection services)
9789
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
9890
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
9991
{
100-
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
101-
loggerFactory.AddDebug();
102-
92+
10393
if (env.IsDevelopment())
10494
{
10595
app.UseDeveloperExceptionPage();
10696
app.UseDatabaseErrorPage();
107-
//app.UseBrowserLink();
97+
app.UseBrowserLink();
10898
}
10999
else
110100
{

‎src/localization.WebApp/localization.WebApp.csproj‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,15 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.0-*" />
25-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0-*" />
26-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0-*" />
27-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.0-*" />
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
29-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0-*" />
30-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0-*" />
31-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0-*" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0-*" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0-*" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0-*" />
36-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0-*" />
37-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0-*" />
38-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0-*" />
39-
<!--
40-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0-*" />
41-
-->
42-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="2.0.0-*" />
43-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0-*" />
24+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" PrivateAssets="All" />
26+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" PrivateAssets="All" />
4427
</ItemGroup>
4528

4629
<ItemGroup>
47-
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.*" />
48-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0-*" />
30+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.*" />
31+
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.*" />
32+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.*" />
4933
</ItemGroup>
5034

5135
</Project>

0 commit comments

Comments
 (0)