Merge branch 'dev_3_0'

damienbod · damienbod · commit a00d54063602 · 2019-09-24T00:04:42.000+02:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Add the NuGet package to the project.json file
 
 ```
 "dependencies": {
-        "Localization.SqlLocalizer": "2.0.5",
+        "Localization.SqlLocalizer": "2.0.6",
 ```
 
 Add the DbContext and use the AddSqlLocalization extension method to add the SQL Localization package.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,10 +1,15 @@
-image: Visual Studio 2017
+image: Visual Studio 2019 Preview
 init:
   - git config --global core.autocrlf true
+environment:
+  nodejs_version: "12"
 install:
   - ECHO %APPVEYOR_BUILD_WORKER_IMAGE%
+  - ps: Install-Product node $env:nodejs_version
+  - cmd: choco install dotnetcore-sdk --pre
   - dotnet --version
   - dotnet restore
+  - choco install googlechrome
 build_script:
 - dotnet build
 before_build:
diff --git a/src/AspNetCoreLocalization/AspNetCoreLocalization.csproj b/src/AspNetCoreLocalization/AspNetCoreLocalization.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-beta" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/AspNetCoreLocalization/Program.cs b/src/AspNetCoreLocalization/Program.cs
@@ -1,18 +1,21 @@
-﻿using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace AspNetCoreLocalization
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
-}
+}
diff --git a/src/AspNetCoreLocalization/Startup.cs b/src/AspNetCoreLocalization/Startup.cs
@@ -14,29 +14,24 @@
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Swagger;
 using System.Reflection;
+using Microsoft.Extensions.Hosting;
 
 namespace AspNetCoreLocalization
 {
     public class Startup
     {
         private bool _createNewRecordWhenLocalisedStringDoesNotExist = false;
-        public Startup(IHostingEnvironment env)
+        public Startup(IConfiguration configuration, IWebHostEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
-
-            builder.AddEnvironmentVariables();
-            Configuration = builder.Build();
+            Configuration = configuration;
 
             if (env.IsDevelopment())
             {
                 _createNewRecordWhenLocalisedStringDoesNotExist = true;
             }
         }
 
-        public IConfigurationRoot Configuration { get; set; }
+        public IConfiguration Configuration { get; }
 
         public void ConfigureServices(IServiceCollection services)
         {
@@ -85,7 +80,9 @@ public void ConfigureServices(IServiceCollection services)
                     options.SupportedUICultures = supportedCultures;
                 });
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
+            services.AddControllersWithViews()
+                .AddNewtonsoftJson()
+                .SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
                 .AddViewLocalization()
                 .AddDataAnnotationsLocalization(options =>
                 {
@@ -106,21 +103,23 @@ public void ConfigureServices(IServiceCollection services)
             });
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             var locOptions = app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>();
             app.UseRequestLocalization(locOptions.Value);
 
+            app.UseDefaultFiles();
             app.UseStaticFiles();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
+                endpoints.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
 
-            // Enable middleware to serve generated Swagger as a JSON endpoint.
             app.UseSwagger();
             app.UseSwaggerUI(c =>
             {
diff --git a/src/AspNetCoreLocalization/package-lock.json b/src/AspNetCoreLocalization/package-lock.json
diff --git a/src/AspNetCoreLocalization/web.config b/src/AspNetCoreLocalization/web.config
@@ -8,6 +8,7 @@
       <environmentVariables>
         <environmentVariable name="ASPNETCORE_HTTPS_PORT" value="44392" />
         <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
+        <environmentVariable name="COMPLUS_ForceENC" value="1" />
       </environmentVariables>
     </aspNetCore>
   </system.webServer>
diff --git a/src/ImportExportLocalization/ImportExportLocalization.csproj b/src/ImportExportLocalization/ImportExportLocalization.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
@@ -16,12 +16,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
+    <PackageReference Include="BuildBundlerMinifier" Version="3.0.415" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4" PrivateAssets="all">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
     <PackageReference Include="WebApiContrib.Core.Formatter.Csv" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/src/ImportExportLocalization/LocalizationRecords.sqlite b/src/ImportExportLocalization/LocalizationRecords.sqlite
diff --git a/src/ImportExportLocalization/Program.cs b/src/ImportExportLocalization/Program.cs
@@ -1,17 +1,21 @@
 ﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace ImportExportLocalization
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }
diff --git a/src/ImportExportLocalization/Startup.cs b/src/ImportExportLocalization/Startup.cs
@@ -12,22 +12,18 @@
 using Microsoft.Net.Http.Headers;
 using WebApiContrib.Core.Formatter.Csv;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Hosting;
 
 namespace ImportExportLocalization
 {
     public class Startup
     {
-        public Startup(IHostingEnvironment env)
+        public Startup(IConfiguration configuration)
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
+            Configuration = configuration;
         }
 
-        public IConfigurationRoot Configuration { get; }
+        public IConfiguration Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
@@ -46,7 +42,8 @@ public void ConfigureServices(IServiceCollection services)
             // Requires that LocalizationModelContext is defined
             services.AddSqlLocalization(options => options.UseTypeFullNames = true);
 
-            services.AddMvc()
+            services.AddControllersWithViews()
+                .AddNewtonsoftJson()
                 .AddViewLocalization()
                 .AddDataAnnotationsLocalization();
 
@@ -72,13 +69,13 @@ public void ConfigureServices(IServiceCollection services)
                 options.InputFormatters.Add(new CsvInputFormatter(csvFormatterOptions));
                 options.OutputFormatters.Add(new CsvOutputFormatter(csvFormatterOptions));
                 options.FormatterMappings.SetMediaTypeMappingForFormat("csv", MediaTypeHeaderValue.Parse("text/csv"));
-            }).SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            }).SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 
             services.AddScoped<ValidateMimeMultipartContentFilter>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             var locOptions = app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>();
             app.UseRequestLocalization(locOptions.Value);
@@ -92,13 +89,16 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseExceptionHandler("/Home/Error");
             }
 
+            app.UseDefaultFiles();
             app.UseStaticFiles();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
+                endpoints.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }
diff --git a/src/ImportExportLocalization/web.config b/src/ImportExportLocalization/web.config
@@ -15,8 +15,12 @@
     <handlers>
       <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00">
-      <environmentVariables />
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00" hostingModel="InProcess">
+      <environmentVariables>
+        <environmentVariable name="ASPNETCORE_HTTPS_PORT" value="44391" />
+        <environmentVariable name="COMPLUS_ForceENC" value="1" />
+        <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
+      </environmentVariables>
     </aspNetCore>
   </system.webServer>
 </configuration>
diff --git a/src/Localization.SqlLocalizer/Localization.SqlLocalizer.csproj b/src/Localization.SqlLocalizer/Localization.SqlLocalizer.csproj
@@ -9,14 +9,14 @@
     <Summary>ASP.NET Core Localization using SQL with EF Core</Summary>
     <PackageId>Localization.SqlLocalizer</PackageId>
     <PackageTags>Localization;SqlLocalizer;SQlite;Postgres;MS SQL Server;MySQL</PackageTags>
-    <PackageReleaseNotes>Release Notes: Version 2.0.5
-fixed multi threading issues</PackageReleaseNotes>
+    <PackageReleaseNotes>Release Notes: Version 2.0.6
+View localizer now respects UsePropertyNamesOnly property. fixed unused service</PackageReleaseNotes>
     <PackageIconUrl>http://www.gravatar.com/avatar/61d005637f57b5c3da8ba662cf04a9d6.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/damienbod/AspNet5Localization</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/damienbod/AspNet5Localization</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.0.5</Version>
+    <Version>2.0.6</Version>
     <PackageLicenseUrl>https://github.com/damienbod/AspNet5Localization/blob/master/LICENSE</PackageLicenseUrl>
     <Copyright>2019 @damienbod</Copyright>
   </PropertyGroup>
diff --git a/src/Localization.SqlLocalizer/SqlLocalizationServiceCollectionExtensions.cs b/src/Localization.SqlLocalizer/SqlLocalizationServiceCollectionExtensions.cs
@@ -49,10 +49,10 @@ public static IServiceCollection AddSqlLocalization(
                 typeof(IStringLocalizerFactory),
                 typeof(SqlStringLocalizerFactory),
                 ServiceLifetime.Singleton));
-            services.TryAdd(new ServiceDescriptor(
-                typeof(IStringLocalizer),
-                typeof(SqlStringLocalizer),
-                ServiceLifetime.Transient));
+            //services.TryAdd(new ServiceDescriptor(
+            //    typeof(IStringLocalizer),
+            //    typeof(SqlStringLocalizer),
+            //    ServiceLifetime.Transient));
             services.TryAdd(new ServiceDescriptor(
               typeof(DevelopmentSetup),
               typeof(DevelopmentSetup),

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,21 @@`
`1`		`-using Microsoft.AspNetCore;`
	`1`	`+using Microsoft.AspNetCore;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
	`3`	`+using Microsoft.Extensions.Hosting;`
`3`	`4`
`4`	`5`	`namespace AspNetCoreLocalization`
`5`	`6`	`{`
`6`	`7`	`public class Program`
`7`	`8`	`{`
`8`	`9`	`public static void Main(string[] args)`
`9`	`10`	`{`
`10`		`- BuildWebHost(args).Run();`
	`11`	`+ CreateHostBuilder(args).Build().Run();`
`11`	`12`	`}`
`12`	`13`
`13`		`- public static IWebHost BuildWebHost(string[] args) =>`
`14`		`- WebHost.CreateDefaultBuilder(args)`
`15`		`- .UseStartup<Startup>()`
`16`		`- .Build();`
	`14`	`+ public static IHostBuilder CreateHostBuilder(string[] args) =>`
	`15`	`+ Host.CreateDefaultBuilder(args)`
	`16`	`+ .ConfigureWebHostDefaults(webBuilder =>`
	`17`	`+ {`
	`18`	`+ webBuilder.UseStartup<Startup>();`
	`19`	`+ });`
`17`	`20`	`}`
`18`		`-}`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,29 +14,24 @@`
`14`	`14`	`using Microsoft.AspNetCore.Mvc;`
`15`	`15`	`using Swashbuckle.AspNetCore.Swagger;`
`16`	`16`	`using System.Reflection;`
	`17`	`+using Microsoft.Extensions.Hosting;`
`17`	`18`
`18`	`19`	`namespace AspNetCoreLocalization`
`19`	`20`	`{`
`20`	`21`	`public class Startup`
`21`	`22`	`{`
`22`	`23`	`private bool _createNewRecordWhenLocalisedStringDoesNotExist = false;`
`23`		`- public Startup(IHostingEnvironment env)`
	`24`	`+ public Startup(IConfiguration configuration, IWebHostEnvironment env)`
`24`	`25`	`{`
`25`		`- var builder = new ConfigurationBuilder()`
`26`		`- .SetBasePath(env.ContentRootPath)`
`27`		`- .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)`
`28`		`- .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);`
`29`		`-`
`30`		`- builder.AddEnvironmentVariables();`
`31`		`- Configuration = builder.Build();`
	`26`	`+ Configuration = configuration;`
`32`	`27`
`33`	`28`	`if (env.IsDevelopment())`
`34`	`29`	`{`
`35`	`30`	`_createNewRecordWhenLocalisedStringDoesNotExist = true;`
`36`	`31`	`}`
`37`	`32`	`}`
`38`	`33`
`39`		`- public IConfigurationRoot Configuration { get; set; }`
	`34`	`+ public IConfiguration Configuration { get; }`
`40`	`35`
`41`	`36`	`public void ConfigureServices(IServiceCollection services)`
`42`	`37`	`{`
`@@ -85,7 +80,9 @@ public void ConfigureServices(IServiceCollection services)`
`85`	`80`	`options.SupportedUICultures = supportedCultures;`
`86`	`81`	`});`
`87`	`82`
`88`		`- services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2)`
	`83`	`+ services.AddControllersWithViews()`
	`84`	`+ .AddNewtonsoftJson()`
	`85`	`+ .SetCompatibilityVersion(CompatibilityVersion.Version_3_0)`
`89`	`86`	`.AddViewLocalization()`
`90`	`87`	`.AddDataAnnotationsLocalization(options =>`
`91`	`88`	`{`
`@@ -106,21 +103,23 @@ public void ConfigureServices(IServiceCollection services)`
`106`	`103`	`});`
`107`	`104`	`}`
`108`	`105`
`109`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
	`106`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`110`	`107`	`{`
`111`	`108`	`var locOptions = app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>();`
`112`	`109`	`app.UseRequestLocalization(locOptions.Value);`
`113`	`110`
	`111`	`+ app.UseDefaultFiles();`
`114`	`112`	`app.UseStaticFiles();`
`115`	`113`
`116`		`- app.UseMvc(routes =>`
	`114`	`+ app.UseRouting();`
	`115`	`+`
	`116`	`+ app.UseEndpoints(endpoints =>`
`117`	`117`	`{`
`118`		`- routes.MapRoute(`
	`118`	`+ endpoints.MapControllerRoute(`
`119`	`119`	`name: "default",`
`120`		`- template: "{controller=Home}/{action=Index}/{id?}");`
	`120`	`+ pattern: "{controller=Home}/{action=Index}/{id?}");`
`121`	`121`	`});`
`122`	`122`
`123`		`- // Enable middleware to serve generated Swagger as a JSON endpoint.`
`124`	`123`	`app.UseSwagger();`
`125`	`124`	`app.UseSwaggerUI(c =>`
`126`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,21 @@`
`1`	`1`	`using Microsoft.AspNetCore;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
	`3`	`+using Microsoft.Extensions.Hosting;`
`3`	`4`
`4`	`5`	`namespace ImportExportLocalization`
`5`	`6`	`{`
`6`	`7`	`public class Program`
`7`	`8`	`{`
`8`	`9`	`public static void Main(string[] args)`
`9`	`10`	`{`
`10`		`- CreateWebHostBuilder(args).Build().Run();`
	`11`	`+ CreateHostBuilder(args).Build().Run();`
`11`	`12`	`}`
`12`	`13`
`13`		`- public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`14`		`- WebHost.CreateDefaultBuilder(args)`
`15`		`- .UseStartup<Startup>();`
	`14`	`+ public static IHostBuilder CreateHostBuilder(string[] args) =>`
	`15`	`+ Host.CreateDefaultBuilder(args)`
	`16`	`+ .ConfigureWebHostDefaults(webBuilder =>`
	`17`	`+ {`
	`18`	`+ webBuilder.UseStartup<Startup>();`
	`19`	`+ });`
`16`	`20`	`}`
`17`	`21`	`}`