diff --git a/.gitignore b/.gitignore index 12fdef8038..effd6d5731 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ nuget.exe *.ipch *.sln.ide *launchSettings.json -**/Resources/*.Designer.cs \ No newline at end of file +**/Resources/*.Designer.cs +.vscode/ diff --git a/build/dependencies.props b/build/dependencies.props index e704edaec0..4d37993d25 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,11 @@ - 1.6.1 + 1.2.0-* + 0.3.0-* 4.3.0 + 4.7.1 + 1.6.1 + 15.0.0 + 2.2.0 diff --git a/samples/LocalizationSample/LocalizationSample.csproj b/samples/LocalizationSample/LocalizationSample.csproj index 74eacc2eb6..064aa6a094 100644 --- a/samples/LocalizationSample/LocalizationSample.csproj +++ b/samples/LocalizationSample/LocalizationSample.csproj @@ -1,17 +1,20 @@  + + net452;netcoreapp1.1 - netcoreapp1.1 - Exe - - - + + + + + + diff --git a/samples/LocalizationSample/web.config b/samples/LocalizationSample/web.config deleted file mode 100644 index f7ac679334..0000000000 --- a/samples/LocalizationSample/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file 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 17f81580ba..f9a74fd638 100644 --- a/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Microsoft.AspNetCore.Localization.Routing/Microsoft.AspNetCore.Localization.Routing.csproj @@ -13,8 +13,11 @@ - - + + + + + diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj index 19775ddadf..bee4cd05ae 100644 --- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj +++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.csproj @@ -13,9 +13,12 @@ - - - + + + + + + diff --git a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj index 3ff4dbd28f..ee77071cbd 100644 --- a/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj +++ b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.csproj @@ -13,9 +13,12 @@ - - - + + + + + + diff --git a/test/LocalizationWebsite/LocalizationWebsite.csproj b/test/LocalizationWebsite/LocalizationWebsite.csproj index 082a8c4397..50d7b6c152 100644 --- a/test/LocalizationWebsite/LocalizationWebsite.csproj +++ b/test/LocalizationWebsite/LocalizationWebsite.csproj @@ -5,7 +5,6 @@ netcoreapp1.1;net452 netcoreapp1.1 - Exe @@ -13,10 +12,13 @@ - - - - + + + + + + + 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 24a0d564c2..d247efb975 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.csproj @@ -8,13 +8,16 @@ - - - - - - - + + + + + + + + + + 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 944ee6d7ea..28c07231ad 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 @@ -9,11 +9,14 @@ - - - - - + + + + + + + + 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 56e06f7e97..f984f04e88 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj +++ b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.csproj @@ -9,11 +9,14 @@ - - - - - + + + + + + + + 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 deac0c5872..ae41ca00b2 100644 --- a/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj +++ b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.csproj @@ -9,13 +9,16 @@ - - - - - - - + + + + + + + + + +