Skip to content
This repository was archived by the owner on Nov 29, 2018. It is now read-only.

Commit 870cc9d

Browse files
committed
Change TFM to netcorepp2.0
1 parent 87ae098 commit 870cc9d

File tree

13 files changed

+18
-1553
lines changed

13 files changed

+18
-1553
lines changed

build/dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AspNetCoreVersion>2.0.0-preview1-*</AspNetCoreVersion>
44
<AspNetIntegrationTestingVersion>0.4.0-*</AspNetIntegrationTestingVersion>
55
<CoreFxVersion>4.3.0</CoreFxVersion>
6-
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
6+
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
77
<MoqVersion>4.7.1</MoqVersion>
88
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
99
<TestSdkVersion>15.0.0</TestSdkVersion>

samples/LocalizationSample/LocalizationSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

samples/LocalizationSample/Startup.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ public void Configure(IApplicationBuilder app, IStringLocalizer<Startup> SR)
3434
new CultureInfo("zh"),
3535
new CultureInfo("zh-CN")
3636
};
37-
#if NET46
38-
supportedCultures.Add(new CultureInfo("zh-CHT"));
39-
#elif NETCOREAPP2_0
40-
#else
41-
#error target frameworks need to be updated.
42-
#endif
4337
var options = new RequestLocalizationOptions
4438
{
4539
DefaultRequestCulture = new RequestCulture("en-US"),
@@ -149,12 +143,6 @@ private static async System.Threading.Tasks.Task WriteCultureSelectOptions(HttpC
149143
await context.Response.WriteAsync($" <option value=\"{new CultureInfo("ja-JP").Name}\">{new CultureInfo("ja-JP").DisplayName}</option>");
150144
await context.Response.WriteAsync($" <option value=\"{new CultureInfo("zh").Name}\">{new CultureInfo("zh").DisplayName}</option>");
151145
await context.Response.WriteAsync($" <option value=\"{new CultureInfo("zh-CN").Name}\">{new CultureInfo("zh-CN").DisplayName}</option>");
152-
#if NET46
153-
await context.Response.WriteAsync($" <option value=\"{new CultureInfo("zh-CHT").Name}\">{new CultureInfo("zh-CHT").DisplayName}</option>");
154-
#elif NETCOREAPP2_0
155-
#else
156-
#error target frameworks need to be updated.
157-
#endif
158146
await context.Response.WriteAsync($" <option value=\"en-NOTREAL\">English (Not a real locale)</option>");
159147
await context.Response.WriteAsync($" <option value=\"pp-NOTREAL\">Made-up (Not a real anything)</option>");
160148
}

src/Microsoft.AspNetCore.Localization.Routing/baseline.net45.json

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)