From 2587e08098152a347201b1743f4e0b01ace7d455 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 22 Mar 2017 07:39:30 -0700 Subject: [PATCH] Change compilation targets. * Remove net451 as a compilation target * Upgrade to netcoreapp2.0 --- .gitignore | 1 + build/dependencies.props | 1 + .../LocalizationSample/LocalizationSample.csproj | 2 +- samples/LocalizationSample/Startup.cs | 10 ++++++++-- ...rosoft.AspNetCore.Localization.Routing.csproj | 2 +- .../Microsoft.AspNetCore.Localization.csproj | 2 +- .../RequestLocalizationMiddleware.cs | 5 ----- .../Microsoft.Extensions.Localization.csproj | 2 +- .../LocalizationWebsite.csproj | 4 ++-- ...spNetCore.Localization.FunctionalTests.csproj | 2 +- .../TestRunner.cs | 2 +- ....AspNetCore.Localization.Routing.Tests.csproj | 6 ++++-- ...icrosoft.AspNetCore.Localization.Tests.csproj | 6 ++++-- .../RequestLocalizationOptionsTest.cs | 16 +--------------- ...icrosoft.Extensions.Localization.Tests.csproj | 6 +++--- .../ResourcesClassLibraryNoAttribute.csproj | 3 +-- .../ResourcesClassLibraryWithAttribute.csproj | 3 +-- 17 files changed, 32 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index effd6d5731..1ce76e50c8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ nuget.exe *launchSettings.json **/Resources/*.Designer.cs .vscode/ +global.json diff --git a/build/dependencies.props b/build/dependencies.props index 4d37993d25..867628062b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,6 +5,7 @@ 4.3.0 4.7.1 1.6.1 + 2.0.0-* 15.0.0 2.2.0 diff --git a/samples/LocalizationSample/LocalizationSample.csproj b/samples/LocalizationSample/LocalizationSample.csproj index 064aa6a094..f8dc6aeafe 100644 --- a/samples/LocalizationSample/LocalizationSample.csproj +++ b/samples/LocalizationSample/LocalizationSample.csproj @@ -3,7 +3,7 @@ - net452;netcoreapp1.1 + net46;netcoreapp2.0 diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs index 07b6fbd6cd..da118bcc13 100644 --- a/samples/LocalizationSample/Startup.cs +++ b/samples/LocalizationSample/Startup.cs @@ -34,8 +34,11 @@ namespace LocalizationSample new CultureInfo("zh"), new CultureInfo("zh-CN") }; -#if !NETCOREAPP1_1 +#if NET46 supportedCultures.Add(new CultureInfo("zh-CHT")); +#elif NETCOREAPP2_0 +#else +#error target frameworks need to be updated. #endif var options = new RequestLocalizationOptions { @@ -146,8 +149,11 @@ $@" await context.Response.WriteAsync($" "); await context.Response.WriteAsync($" "); await context.Response.WriteAsync($" "); -#if NET451 +#if NET46 await context.Response.WriteAsync($" "); +#elif NETCOREAPP2_0 +#else +#error target frameworks need to be updated. #endif await context.Response.WriteAsync($" "); await context.Response.WriteAsync($" "); diff --git a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj index f9a74fd638..bc7d7d8279 100644 --- a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj @@ -5,7 +5,7 @@ Microsoft ASP.NET Core Provides a request culture provider which gets culture and ui-culture from request's route data. - net451;netstandard1.3 + netstandard1.3 $(NoWarn);CS1591 true aspnetcore;localization diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj index bee4cd05ae..55ceeea9d7 100644 --- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj +++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj @@ -5,7 +5,7 @@ Microsoft ASP.NET Core ASP.NET Core middleware for automatically applying culture information to HTTP requests. Culture information can be specified in the HTTP header, query string, cookie, or custom source. - net451;netstandard1.3 + netstandard1.3 $(NoWarn);CS1591 true aspnetcore;localization diff --git a/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs b/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs index ff5edf81ca..0e34da2231 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs @@ -126,13 +126,8 @@ namespace Microsoft.AspNetCore.Localization private static void SetCurrentThreadCulture(RequestCulture requestCulture) { -#if NET451 - Thread.CurrentThread.CurrentCulture = requestCulture.Culture; - Thread.CurrentThread.CurrentUICulture = requestCulture.UICulture; -#else CultureInfo.CurrentCulture = requestCulture.Culture; CultureInfo.CurrentUICulture = requestCulture.UICulture; -#endif } private static CultureInfo GetCultureInfo( diff --git a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj index ee77071cbd..5ca15bd14f 100644 --- a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj +++ b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj @@ -5,7 +5,7 @@ Microsoft .NET Extensions Application localization services and default implementation based on ResourceManager to load localized assembly resources. - net451;netstandard1.3 + netstandard1.3 $(NoWarn);CS1591 true localization diff --git a/test/LocalizationWebsite/LocalizationWebsite.csproj b/test/LocalizationWebsite/LocalizationWebsite.csproj index 50d7b6c152..9626549420 100644 --- a/test/LocalizationWebsite/LocalizationWebsite.csproj +++ b/test/LocalizationWebsite/LocalizationWebsite.csproj @@ -3,8 +3,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net46 + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj index d247efb975..a0dcab7e8b 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj @@ -3,7 +3,7 @@ - netcoreapp1.1 + netcoreapp2.0 diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs index d5af11fda0..64c8272dfa 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests { ApplicationBaseUriHint = applicationBaseUrl, EnvironmentName = environmentName, - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net452" : "netcoreapp1.1" + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0" }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, logger)) diff --git a/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj index 28c07231ad..f8396e7d46 100644 --- a/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj +++ b/test/Microsoft.AspNetCore.Localization.Routing.Tests/Microsoft.AspNetCore.Localization.Routing.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net46 + netcoreapp2.0 + true + true diff --git a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj index f984f04e88..35c3f273da 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj +++ b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj @@ -3,8 +3,10 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net46 + netcoreapp2.0 + true + true diff --git a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs index 1dde020817..d10f6b690f 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs @@ -37,13 +37,9 @@ namespace Microsoft.AspNetCore.Localization.Tests { // Arrange var explicitCulture = new CultureInfo("fr-FR"); -#if NET452 - Thread.CurrentThread.CurrentCulture = explicitCulture; - Thread.CurrentThread.CurrentUICulture = explicitCulture; -#else CultureInfo.CurrentCulture = explicitCulture; CultureInfo.CurrentUICulture = explicitCulture; -#endif + // Act var options = new RequestLocalizationOptions(); @@ -78,13 +74,8 @@ namespace Microsoft.AspNetCore.Localization.Tests { // Arrange var explicitCulture = new CultureInfo("fr-FR"); -#if NET452 - Thread.CurrentThread.CurrentCulture = explicitCulture; - Thread.CurrentThread.CurrentUICulture = explicitCulture; -#else CultureInfo.CurrentCulture = explicitCulture; CultureInfo.CurrentUICulture = explicitCulture; -#endif // Act var options = new RequestLocalizationOptions(); @@ -96,13 +87,8 @@ namespace Microsoft.AspNetCore.Localization.Tests public void Dispose() { -#if NET452 - Thread.CurrentThread.CurrentCulture = _initialCulture; - Thread.CurrentThread.CurrentUICulture = _initialUICulture; -#else CultureInfo.CurrentCulture = _initialCulture; CultureInfo.CurrentUICulture = _initialUICulture; -#endif } } } diff --git a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj index ae41ca00b2..0aa3b0ca0a 100644 --- a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj +++ b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj @@ -3,8 +3,8 @@ - netcoreapp1.1;net452 - netcoreapp1.1 + netcoreapp2.0;net46 + netcoreapp2.0 @@ -21,7 +21,7 @@ - + diff --git a/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj b/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj index 5d219cd618..8d1ee5362e 100644 --- a/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj +++ b/test/ResourcesClassLibraryNoAttribute/ResourcesClassLibraryNoAttribute.csproj @@ -3,8 +3,7 @@ - net452;netstandard1.6 - netstandard1.6 + netstandard1.0 diff --git a/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj b/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj index 1cc953af1f..e6fe455e4b 100644 --- a/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj +++ b/test/ResourcesClassLibraryWithAttribute/ResourcesClassLibraryWithAttribute.csproj @@ -3,8 +3,7 @@ - net452;netstandard1.6 - netstandard1.6 + netstandard1.3